Tue Oct 4 23:14:30 UTC 2011

9 files changed, 143 insertions, 78 deletions

diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index 19feb931e..be383a4e1 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 131824 2011-07-15 23:53:22Z dan $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 139637 2011-10-04 00:28:34Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=inetutils
 pkgver=1.8
-pkgrel=3
+pkgrel=5
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/"
 license=('GPL')
+groups=('base')
 depends=('readline' 'ncurses' 'pam')
 provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
 conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
@@ -16,16 +17,20 @@ backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
         '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 \
-        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd)
-md5sums=('ad8fdcdf1797b9ca258264a6b04e48fd' 'c167200f6faeb64659e69ced2a9d672a'\
-         'e6e6e5990a2e8159a276fef8fbf54c04' '8596208d119045543c5fb644e1d713d5'\
-         '2c3655985cf122591d71d031af84ff90' 'c490ea36751ac5f1d61d2c014959a3d1'\
-         'c25d8382a994de84d9c6962d804f689b' 'c3aa508a9d1293a787341108cd49c1b7')
-sha1sums=('598445859b511f73681e4d74a41d65cd6ae0f83e' '84dc802b5e57b5e04c847572225a3b9612017155'\
-         '68a590083b45997dfdb80e666b2de762f494ba74' 'bfad98a4a62f1fff8779f076c6019ed07f9111af'\
-         '27d99b910eec0fc26bd79ccc2c1de26608330298' '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'\
-         '81f10b3b688e3952f793b35bcef63b5bf257a92b' '81f4a8da823cf0bb14284fc71ee6108849691eda')
+source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
+        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd \
+        dnsdomainname domainname)
+sha1sums=('598445859b511f73681e4d74a41d65cd6ae0f83e'
+          'c439b577214017be9cccd1b2fbba048964386a0e'
+          '84dc802b5e57b5e04c847572225a3b9612017155'
+          '68a590083b45997dfdb80e666b2de762f494ba74'
+          'bfad98a4a62f1fff8779f076c6019ed07f9111af'
+          '27d99b910eec0fc26bd79ccc2c1de26608330298'
+          '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'
+          '81f10b3b688e3952f793b35bcef63b5bf257a92b'
+          '81f4a8da823cf0bb14284fc71ee6108849691eda'
+          'ac69756d6cc50157d430d863db04a5aac4688380'
+          'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -38,13 +43,12 @@ build() {
     --enable-rlogin --enable-rlogind \
     --enable-rsh --enable-rshd \
     --enable-rexec --enable-rexecd \
-    --enable-rcp \
+    --enable-rcp --enable-hostname \
     --disable-tftp --disable-tftpd \
     --disable-ping --disable-ping6 \
     --disable-logger --disable-syslogd \
     --disable-inetd --disable-whois \
-    --disable-uucpd --disable-hostname \
-    --disable-ifconfig --disable-traceroute
+    --disable-uucpd --disable-ifconfig --disable-traceroute
   make
 }
 
@@ -52,6 +56,12 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
+  install -d "${pkgdir}/bin"
+  ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
+  install -D -m755 "${srcdir}/domainname" "${pkgdir}/bin/domainname"
+  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
+  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/domainname.1"
+  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
   install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
   install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
   install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
diff --git a/core/inetutils/dnsdomainname b/core/inetutils/dnsdomainname
new file mode 100644
index 000000000..4bba209fe
--- /dev/null
+++ b/core/inetutils/dnsdomainname
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/hostname -y "$@"
diff --git a/core/inetutils/domainname b/core/inetutils/domainname
new file mode 100644
index 000000000..a1b8a8c31
--- /dev/null
+++ b/core/inetutils/domainname
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/hostname -d "$@"
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index 94356ab28..b86c0a91c 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 133509 2011-07-28 19:16:56Z stephane $
+# $Id: PKGBUILD 139635 2011-10-03 23:42:42Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
 pkgver=1.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64')
 url="http://web.mit.edu/kerberos/"
@@ -17,11 +17,13 @@ backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
 source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
         krb5-kadmind
         krb5-kdc
-        krb5-1.9.1-config-script.patch)
+        krb5-1.9.1-config-script.patch
+        krb5-1.9.1-canonicalize-fallback.patch)
 sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
           '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
           '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-          '8d1ec8bdb39fec230caace112d1a41ad792f7d97')
+          '7342410760cf44bfa01bb99bb4c49e12496cb46f'
+          '238c268fa6cb42fc7324ab54db9abda5cd77f833')
 options=('!emptydirs')
 
 build() {
@@ -30,14 +32,21 @@ build() {
 
    # - Make krb5-config suppress CFLAGS output when called with --libs
    #   cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
-   #      http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-buildconf.patch
    #
    # - Omit extra libraries because their interfaces are not exposed to applications
    #   by libkrb5, unless do_deps is set to 1, which indicates that the caller
    #   wants the whole list.
-   #   cf http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-nodeplibs.patch
+   #
+   #   Patch from upstream : 
+   #   http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236
    patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
 
+   # FS#25515
+   patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch
+
+   # FS#25384
+   sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
+
    export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
    export CPPFLAGS+=" -I/usr/include/et"
    ./configure --prefix=/usr \
@@ -69,5 +78,8 @@ package() {
    install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d
    install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
 
+   install -dm 755 "${pkgdir}"/usr/share/aclocal
+   install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
+
    install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/core/krb5/krb5-1.9.1-canonicalize-fallback.patch b/core/krb5/krb5-1.9.1-canonicalize-fallback.patch
new file mode 100644
index 000000000..e5a38498f
--- /dev/null
+++ b/core/krb5/krb5-1.9.1-canonicalize-fallback.patch
@@ -0,0 +1,58 @@
+diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c
+--- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c	2011-02-09 16:55:36.000000000 -0500
++++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c	2011-09-26 18:42:01.465190278 -0400
+@@ -470,13 +470,10 @@
+ 
+ /***** STATE_REFERRALS *****/
+ 
+-/*
+- * Possibly retry a request in the fallback realm after a referral request
+- * failure in the local realm.  Expects ctx->reply_code to be set to the error
+- * from a referral request.
+- */
++/* Possibly try a non-referral request after a referral request failure.
++ * Expects ctx->reply_code to be set to the error from a referral request. */
+ static krb5_error_code
+-try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx)
++try_fallback(krb5_context context, krb5_tkt_creds_context ctx)
+ {
+     krb5_error_code code;
+     char **hrealms;
+@@ -485,9 +482,10 @@
+     if (ctx->referral_count > 1)
+         return ctx->reply_code;
+ 
+-    /* Only fall back if the original request used the referral realm. */
++    /* If the request used a specified realm, make a non-referral request to
++     * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */
+     if (!krb5_is_referral_realm(&ctx->req_server->realm))
+-        return ctx->reply_code;
++        return begin_non_referral(context, ctx);
+ 
+     if (ctx->server->length < 2) {
+         /* We need a type/host format principal to find a fallback realm. */
+@@ -500,10 +498,10 @@
+     if (code != 0)
+         return code;
+ 
+-    /* Give up if the fallback realm isn't any different. */
++    /* If the fallback realm isn't any different, use the existing TGT. */
+     if (data_eq_string(ctx->server->realm, hrealms[0])) {
+         krb5_free_host_realm(context, hrealms);
+-        return ctx->reply_code;
++        return begin_non_referral(context, ctx);
+     }
+ 
+     /* Rewrite server->realm to be the fallback realm. */
+@@ -540,9 +538,9 @@
+     krb5_error_code code;
+     const krb5_data *referral_realm;
+ 
+-    /* Possibly retry with the fallback realm on error. */
++    /* Possibly try a non-referral fallback request on error. */
+     if (ctx->reply_code != 0)
+-        return try_fallback_realm(context, ctx);
++        return try_fallback(context, ctx);
+ 
+     if (krb5_principal_compare(context, ctx->reply_creds->server,
+                                ctx->server)) {
diff --git a/core/krb5/krb5-1.9.1-config-script.patch b/core/krb5/krb5-1.9.1-config-script.patch
index 96ee6b001..a72a75edf 100644
--- a/core/krb5/krb5-1.9.1-config-script.patch
+++ b/core/krb5/krb5-1.9.1-config-script.patch
@@ -1,25 +1,27 @@
 diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
 --- krb5-1.9.1.ori/src/krb5-config.in	2010-01-19 13:44:57.000000000 -0500
-+++ krb5-1.9.1/src/krb5-config.in	2011-07-28 14:32:00.546990621 -0400
++++ krb5-1.9.1/src/krb5-config.in	2011-09-26 18:27:09.018487087 -0400
 @@ -186,7 +186,7 @@
  	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
  	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
  	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
 -	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
-+       -e 's#\$(CFLAGS)##'`
++	    -e 's#\$(CFLAGS)##'`
  
      if test $library = 'kdb'; then
  	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
-@@ -214,7 +214,11 @@
+@@ -214,9 +214,13 @@
      fi
  
      if test $library = 'krb5'; then
 -	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
-+       if test 0$do_deps -eq 1 ; then
-+	        lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
-+       else
-+           lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
-+       fi
++	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
      fi
  
++    # If we ever support a flag to generate output suitable for static
++    # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB"
++    # here.
++
      echo $lib_flags
+ fi
+ 
diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD
index 6a81124ea..e48e2fc5a 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -1,28 +1,30 @@
-# $Id: PKGBUILD 127037 2011-06-10 00:48:19Z bisson $
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 139639 2011-10-04 00:28:38Z eric $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
 pkgname=net-tools
-pkgver=1.60
-pkgrel=18
+pkgver=1.60.20110819cvs
+pkgrel=1
 pkgdesc="Configuration tools for Linux networking"
 arch=(i686 x86_64)
-license=('GPL')
+license=('GPL2')
 url="http://www.tazenda.demon.co.uk/phil/net-tools"
 depends=('glibc')
-source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-  net-tools.patch gcc340.patch net-tools-1.60-2.6-compilefix.patch
+
+# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
+# use cvs checkout instead
+source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2
   net-tools-1.60-miiioctl.patch
-  net-tools-1.60-nameif.patch
   net-tools-1.60-nameif_strncpy.patch)
 options=(!makeflags)
 install=net-tools.install
+sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf'
+          '654a96bc6575efb4a2e04b49de45d448d240eb6e'
+          '7888000d8fe867e58b5b00fe2bcf6c3041d716b4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../net-tools.patch
-  patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch
   patch -Np1 -i ../net-tools-1.60-miiioctl.patch
-  patch -Np1 -i ../gcc340.patch
-  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch
   patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch
   yes "" | make
 }
@@ -34,11 +36,8 @@ package() {
   # the following is provided by yp-tools
   rm "${pkgdir}"/bin/{nis,yp}domainname
   rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
+
+  # hostname is provided by inetutils
+  rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
+  rm -rf "${pkgdir}"/usr/share/man/man1
 }
-md5sums=('888774accab40217dde927e21979c165'
-         '7ef8d0c6818faa0fdeea94970a20e3fb'
-         'b52d899cba9956bb0055150506f41ac1'
-         '51de6eabe2d6d6dc860f72c41cee636b'
-         'c16109863bc63f3dad4ef35305a340bb'
-         '29a32617382fab1735acba4d920f1fcd'
-         'e66466b9304dac85eb42b32f1ec3b284')
diff --git a/core/net-tools/net-tools-1.60-miiioctl.patch b/core/net-tools/net-tools-1.60-miiioctl.patch
index 4859273ed..6c7f0693d 100644
--- a/core/net-tools/net-tools-1.60-miiioctl.patch
+++ b/core/net-tools/net-tools-1.60-miiioctl.patch
@@ -1,17 +1,17 @@
---- net-tools-1.60/include/mii.h.bar	Tue Jul 31 11:49:39 2001
-+++ net-tools-1.60/include/mii.h	Tue Jul 31 11:49:33 2001
-@@ -11,11 +11,9 @@
- 
+--- net-tools-1.60.20110819cvs/include/mii.h	2011-08-19 10:14:00.743873299 +0200
++++ net-tools-1.60.20110819cvs/include/mii.h.new	2011-08-19 10:28:26.500524160 +0200
+@@ -14,11 +14,9 @@
  /* network interface ioctl's for MII commands */
  #ifndef SIOCGMIIPHY
+ #warning "SIOCGMIIPHY is not defined by your kernel source"
 -#define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
 -#define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
 -#define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
 -#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 	/* Read operational parameters */
 -#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 	/* Set operational parameters */
-+#define SIOCGMIIPHY 0x8947 	/* Read from current PHY */
-+#define SIOCGMIIREG 0x8948 	/* Read any PHY register */
-+#define SIOCSMIIREG 0x8949 	/* Write any PHY register */
++#define SIOCGMIIPHY 0x8947     /* Read from current PHY */
++#define SIOCGMIIREG 0x8948     /* Read any PHY register */
++#define SIOCSMIIREG 0x8949     /* Write any PHY register */
  #endif
  
  #include <linux/types.h>
diff --git a/core/net-tools/net-tools.patch b/core/net-tools/net-tools.patch
index 87e062eb2..8af2d2159 100644
--- a/core/net-tools/net-tools.patch
+++ b/core/net-tools/net-tools.patch
@@ -1,25 +1,3 @@
-diff -Naur net-tools-1.60-orig/config.in net-tools-1.60/config.in
---- net-tools-1.60-orig/config.in	2000-05-21 07:32:12.000000000 -0700
-+++ net-tools-1.60/config.in	2004-05-31 12:36:00.000000000 -0700
-@@ -49,7 +49,7 @@
- * 
- bool 'UNIX protocol family' HAVE_AFUNIX y
- bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
--bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
-+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y
- bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
- bool 'Appletalk DDP protocol family' HAVE_AFATALK y
- bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
-@@ -86,6 +86,6 @@
- *
- *           Other Features.
- *
--bool 'IP Masquerading support' HAVE_FW_MASQUERADE n
--bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n
--bool 'Build mii-tool' HAVE_MII n
-+bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
-+bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
-+bool 'Build mii-tool' HAVE_MII y
 diff -Naur net-tools-1.60-orig/mii-tool.c net-tools-1.60/mii-tool.c
 --- net-tools-1.60-orig/mii-tool.c	2000-05-21 07:31:17.000000000 -0700
 +++ net-tools-1.60/mii-tool.c	2004-05-31 12:35:21.000000000 -0700