Mailinglist Archive: opensuse-commit (769 mails)

< Previous Next >
commit opie for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 02 Jun 2009 12:24:12 +0200
  • Message-id: <20090602102412.5B0BF67816B@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package opie for openSUSE:Factory
checked in at Tue Jun 2 12:24:12 CEST 2009.



--------
--- opie/opie.changes 2008-04-10 12:59:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/opie/opie.changes 2009-06-02
10:38:16.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jun 2 10:35:44 CEST 2009 - meissner@xxxxxxx
+
+- rename getline() to telnetgetline() to fix glibc 2.10 build failure.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
opie-2.4-getline.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ opie.spec ++++++
--- /var/tmp/diff_new_pack.Oa6815/_old 2009-06-02 12:23:21.000000000 +0200
+++ /var/tmp/diff_new_pack.Oa6815/_new 2009-06-02 12:23:21.000000000 +0200
@@ -1,10 +1,17 @@
#
# spec file for package opie (Version 2.4)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

@@ -15,7 +22,7 @@
BuildRequires: bison pam-devel
Url: http://www.inner.net/opie
Version: 2.4
-Release: 662
+Release: 697
License: GPL v2 or later
Group: Productivity/Security
Provides: pam_opie
@@ -37,6 +44,7 @@
Patch10: %name-2.4-noroot.patch
Patch11: %{name}-%{version}_array-subscript.patch
Patch12: %{name_pam}-%{version_pam}_array-subscript.patch
+Patch13: %name-2.4-getline.patch
Summary: Support for One-Time Passwords
BuildRoot: %{_tmppath}/%{name}-%{version}-build

@@ -74,6 +82,8 @@
cd %{name_pam}
%patch1 -p0
%patch12
+cd ..
+%patch13

%build
# build opie
@@ -117,6 +127,8 @@
%doc %{_mandir}/man*/*

%changelog
+* Tue Jun 02 2009 meissner@xxxxxxx
+- rename getline() to telnetgetline() to fix glibc 2.10 build failure.
* Thu Apr 10 2008 ro@xxxxxxx
- added baselibs.conf file to build xxbit packages
for multilib support

++++++ opie-2.4-getline.patch ++++++
--- ftpcmd.y
+++ ftpcmd.y
@@ -877,7 +877,7 @@
/*
* getline - a hacked up version of fgets to ignore TELNET escape codes.
*/
-char *getline FUNCTION((s, n, iop), char *s AND int n AND FILE *iop)
+char *telnetgetline FUNCTION((s, n, iop), char *s AND int n AND FILE *iop)
{
register c;
register char *cs;
@@ -958,7 +958,7 @@
case CMD:
(void) signal(SIGALRM, toolong);
(void) alarm((unsigned) timeout);
- if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+ if (telnetgetline(cbuf, sizeof(cbuf)-1, stdin) == NULL)
{
reply(221, "You could at least say goodbye.");
dologout(0);
}
--- opieftpd.c
+++ opieftpd.c
@@ -229,7 +229,7 @@

VOIDRET perror_reply __P((int, char *));
VOIDRET dologout __P((int));
-char *getline __P((char *, int, FILE *));
+char *telnetgetline __P((char *, int, FILE *));
VOIDRET upper __P((char *));

static VOIDRET lostconn __P((int));
@@ -1290,7 +1290,7 @@
if (!transflag)
return;
cp = tmpline;
- if (getline(cp, 7, stdin) == NULL) {
+ if (telnetgetline(cp, 7, stdin) == NULL) {
reply(221, "You could at least say goodbye.");
dologout(0);
}

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread