[arch-commits] Commit in inetutils/repos (5 files)

[Eric Bélanger]

    Date: Saturday, January 3, 2009 @ 20:18:34
  Author: eric
Revision: 23142

Merged revisions 23140 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/inetutils/trunk

........
  r23140 | eric | 2009-01-03 19:55:12 -0500 (Sat, 03 Jan 2009) | 2 lines
  
  upgpkg: inetutils 1.6-2
      Added patch to fix escape character in telnet
........

Added:
  inetutils/repos/testing-i686/iu-1.6.escape.diff
    (from rev 23140, inetutils/trunk/iu-1.6.escape.diff)
Modified:
  inetutils/repos/testing-i686/	(properties)
  inetutils/repos/testing-i686/ChangeLog
  inetutils/repos/testing-i686/PKGBUILD
Deleted:
  inetutils/repos/testing-i686/53_NULL_undeclared.patch

--------------------------+
 53_NULL_undeclared.patch |   12 ------------
 ChangeLog                |    5 +++++
 PKGBUILD                 |   10 +++++-----
 iu-1.6.escape.diff       |   16 ++++++++++++++++
 4 files changed, 26 insertions(+), 17 deletions(-)


Property changes on: inetutils/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /inetutils/trunk:1-23116
   + /inetutils/trunk:1-23141

Deleted: testing-i686/53_NULL_undeclared.patch
===================================================================
--- testing-i686/53_NULL_undeclared.patch	2009-01-04 00:55:34 UTC (rev 23141)
+++ testing-i686/53_NULL_undeclared.patch	2009-01-04 01:18:34 UTC (rev 23142)
@@ -1,12 +0,0 @@
-Index: inetutils-1.5.dfsg.1/libicmp/icmp_timestamp.c
-===================================================================
---- inetutils-1.5.dfsg.1.orig/libicmp/icmp_timestamp.c	2008-07-10 17:37:31.000000000 +0000
-+++ inetutils-1.5.dfsg.1/libicmp/icmp_timestamp.c	2008-07-10 17:37:41.000000000 +0000
-@@ -21,6 +21,7 @@
- # include <config.h>
- #endif
- 
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>

Modified: testing-i686/ChangeLog
===================================================================
--- testing-i686/ChangeLog	2009-01-04 00:55:34 UTC (rev 23141)
+++ testing-i686/ChangeLog	2009-01-04 01:18:34 UTC (rev 23142)
@@ -1,3 +1,8 @@
+2009-01-03  Eric Belanger  <eric at archlinux.org>
+
+	* inetutils 1.6-2
+	* Added patch to fix escape character in telnet
+
 2009-01-02  Eric Belanger  <eric at archlinux.org>
 
 	* inetutils 1.6-1

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-01-04 00:55:34 UTC (rev 23141)
+++ testing-i686/PKGBUILD	2009-01-04 01:18:34 UTC (rev 23142)
@@ -4,7 +4,7 @@
 
 pkgname=inetutils
 pkgver=1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/"
@@ -17,15 +17,15 @@
         'etc/xinetd.d/rexec' 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
 options=('!emptydirs')
 install=inetutils.install
-source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz 53_NULL_undeclared.patch \
+source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz iu-1.6.escape.diff \
         ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-0.17.tar.gz \
         ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd)
-md5sums=('23cc24bc77751bf77d50a07a7395f9b3' 'df4d7a05af0467fc35157349f846b2d6'\
+md5sums=('23cc24bc77751bf77d50a07a7395f9b3' '3675a46bd42cc39e6a2f2f3b96064e28'\
          '65f5f28e2fe22d9ad8b17bb9a10df096' 'c167200f6faeb64659e69ced2a9d672a'\
          'e6e6e5990a2e8159a276fef8fbf54c04' '8596208d119045543c5fb644e1d713d5'\
          '2c3655985cf122591d71d031af84ff90' 'c490ea36751ac5f1d61d2c014959a3d1'\
          'c25d8382a994de84d9c6962d804f689b' 'c3aa508a9d1293a787341108cd49c1b7')
-sha1sums=('481060bd8b93d0efa0a0f2ab5ac5c491773a21af' 'bb7cc8adf54dbbc0539c6aee6f5091bf81bfe7ba'\
+sha1sums=('481060bd8b93d0efa0a0f2ab5ac5c491773a21af' '2223f8e7c191a4edd163b7fb6cbd549ff31ffd6b'\
           '022185bf31af23abbb6d4f34621f94d9d0c4b6ea' '84dc802b5e57b5e04c847572225a3b9612017155'\
           '68a590083b45997dfdb80e666b2de762f494ba74' 'bfad98a4a62f1fff8779f076c6019ed07f9111af'\
           '27d99b910eec0fc26bd79ccc2c1de26608330298' '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'\
@@ -33,7 +33,7 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../53_NULL_undeclared.patch || return 1
+  patch -p0 < ../iu-1.6.escape.diff || return 1
   ./configure --prefix=/usr --libexec=/usr/sbin --mandir=/usr/share/man --infodir=/usr/share/info \
     --with-wrap --with-pam \
     --enable-ftp --enable-ftpd \

Copied: inetutils/repos/testing-i686/iu-1.6.escape.diff (from rev 23140, inetutils/trunk/iu-1.6.escape.diff)
===================================================================
--- testing-i686/iu-1.6.escape.diff	                        (rev 0)
+++ testing-i686/iu-1.6.escape.diff	2009-01-04 01:18:34 UTC (rev 23142)
@@ -0,0 +1,16 @@
+Index: telnet/externs.h
+===================================================================
+RCS file: /cvsroot/inetutils/inetutils/telnet/externs.h,v
+retrieving revision 1.14
+diff -p -u -r1.14 externs.h
+--- telnet/externs.h	27 Dec 2008 20:36:00 -0000	1.14
++++ telnet/externs.h	3 Jan 2009 21:29:23 -0000
+@@ -49,6 +49,8 @@
+    to the Free Software Foundation, Inc., 51 Franklin Street,
+    Fifth Floor, Boston, MA 02110-1301 USA. */
+ 
++#include <unistd.h>
++
+ #ifndef BSD
+ # define BSD 43
+ #endif