Merge branch '2.8' into 3.0

2012-12-23 17:09:04 +01:00 · 2012-12-23 17:09:04 +01:00 · 66ab23651a
commit 66ab23651a
parent 7a38c0271f 11a451040a
4 changed files with 6 additions and 6 deletions
--- a/iputils/.md5sum
+++ b/iputils/.md5sum
@ -1,2 +1,2 @@
-60941cef3b9f17b2c7245ac640ed211c  iputils-man-s20121126.tar.xz
-520f0ce93fbe0cfada6ed65cd06c227c  iputils-s20121126.tar.bz2
+c5808ed90bbf3cf40031c7d4aa0ada67  iputils-man-s20121221.tar.xz
+6072aef64205720dd1893b375e184171  iputils-s20121221.tar.bz2
--- a/iputils/Pkgfile
+++ b/iputils/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: libcap openssl sysfsutils

 name=iputils
-version=s20121126
+version=s20121221
 release=1
 source=(http://www.skbuff.net/iputils/$name-$version.tar.bz2
        http://crux.nu/files/distfiles/$name-man-$version.tar.xz)
@ -12,7 +12,7 @@ source=(http://www.skbuff.net/iputils/$name-$version.tar.bz2
 build() {
    cd $name-$version

-    make CCOPTOPT="$CFLAGS"
+    make USE_GNUTLS=no CCOPTOPT="$CFLAGS"

    install -d $PKG/{{s,}bin,usr/{man/man8,sbin}}
    install ping{,6} $PKG/bin/
--- a/sed/.md5sum
+++ b/sed/.md5sum
@ -1 +1 @@
-7d310fbd76e01a01115075c1fd3f455a  sed-4.2.1.tar.bz2
+7ffe1c7cdc3233e1e0c4b502df253974  sed-4.2.2.tar.bz2
--- a/sed/Pkgfile
+++ b/sed/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  acl

 name=sed
-version=4.2.1
+version=4.2.2
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2)