Merge branch '2.8' into 3.0

This commit is contained in:
Juergen Daubert 2012-12-27 12:38:51 +01:00
commit 1a105f7d62
9 changed files with 32 additions and 22 deletions

View File

@ -12,8 +12,10 @@ drwxr-xr-x root/root usr/lib/awk/
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
lrwxrwxrwx root/root usr/man/man1/awk.1.gz -> gawk.1.gz
lrwxrwxrwx root/root usr/man/man1/dawk.1.gz -> gawk.1.gz
-rw-r--r-- root/root usr/man/man1/gawk.1.gz
-rw-r--r-- root/root usr/man/man1/igawk.1.gz
lrwxrwxrwx root/root usr/man/man1/pawk.1.gz -> gawk.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/awk/
-rw-r--r-- root/root usr/share/awk/assert.awk

View File

@ -1 +1 @@
a601b032c39cd982f34272664f8afa49 gawk-4.0.1.tar.xz
8a9b2f1170ac9dcd3eb13716b5ec4021 gawk-4.0.2.tar.xz

View File

@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=gawk
version=4.0.1
version=4.0.2
release=1
source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)
@ -17,8 +17,10 @@ build() {
make DESTDIR=$PKG install
rm -r $PKG/usr/share/info
rm $PKG/usr/bin/{gawk,pgawk}-$version \
$PKG/usr/man/man1/pgawk.1
rm $PKG/usr/bin/{gawk,pgawk}-$version
rm $PKG/usr/man/man1/{p,d}gawk.1
ln -sf gawk.1.gz $PKG/usr/man/man1/awk.1.gz
ln -sf gawk.1.gz $PKG/usr/man/man1/dawk.1.gz
ln -sf gawk.1.gz $PKG/usr/man/man1/pawk.1.gz
}

View File

@ -36,17 +36,17 @@ drwxr-xr-x root/root usr/lib/gettext/
lrwxrwxrwx root/root usr/lib/libasprintf.so -> libasprintf.so.0.0.0
lrwxrwxrwx root/root usr/lib/libasprintf.so.0 -> libasprintf.so.0.0.0
-rwxr-xr-x root/root usr/lib/libasprintf.so.0.0.0
-rwxr-xr-x root/root usr/lib/libgettextlib-0.18.1.so
-rwxr-xr-x root/root usr/lib/libgettextlib-0.18.2.so
-rwxr-xr-x root/root usr/lib/libgettextlib.la
lrwxrwxrwx root/root usr/lib/libgettextlib.so -> libgettextlib-0.18.1.so
lrwxrwxrwx root/root usr/lib/libgettextlib.so -> libgettextlib-0.18.2.so
-rw-r--r-- root/root usr/lib/libgettextpo.a
-rwxr-xr-x root/root usr/lib/libgettextpo.la
lrwxrwxrwx root/root usr/lib/libgettextpo.so -> libgettextpo.so.0.5.1
lrwxrwxrwx root/root usr/lib/libgettextpo.so.0 -> libgettextpo.so.0.5.1
-rwxr-xr-x root/root usr/lib/libgettextpo.so.0.5.1
-rwxr-xr-x root/root usr/lib/libgettextsrc-0.18.1.so
lrwxrwxrwx root/root usr/lib/libgettextpo.so -> libgettextpo.so.0.5.2
lrwxrwxrwx root/root usr/lib/libgettextpo.so.0 -> libgettextpo.so.0.5.2
-rwxr-xr-x root/root usr/lib/libgettextpo.so.0.5.2
-rwxr-xr-x root/root usr/lib/libgettextsrc-0.18.2.so
-rwxr-xr-x root/root usr/lib/libgettextsrc.la
lrwxrwxrwx root/root usr/lib/libgettextsrc.so -> libgettextsrc-0.18.1.so
lrwxrwxrwx root/root usr/lib/libgettextsrc.so -> libgettextsrc-0.18.2.so
-rw-r--r-- root/root usr/lib/preloadable_libintl.so
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
@ -116,7 +116,7 @@ drwxr-xr-x root/root usr/share/aclocal/
-rw-r--r-- root/root usr/share/aclocal/xsize.m4
drwxr-xr-x root/root usr/share/gettext/
-rw-r--r-- root/root usr/share/gettext/ABOUT-NLS
-rw-r--r-- root/root usr/share/gettext/archive.dir.tar.gz
-rw-r--r-- root/root usr/share/gettext/archive.dir.tar.xz
-rwxr-xr-x root/root usr/share/gettext/config.rpath
-rw-r--r-- root/root usr/share/gettext/gettext.h
drwxr-xr-x root/root usr/share/gettext/intl/
@ -142,7 +142,7 @@ drwxr-xr-x root/root usr/share/gettext/intl/
-rw-r--r-- root/root usr/share/gettext/intl/intl-exports.c
-rw-r--r-- root/root usr/share/gettext/intl/l10nflist.c
-rw-r--r-- root/root usr/share/gettext/intl/langprefs.c
-rw-r--r-- root/root usr/share/gettext/intl/libgnuintl.h.in
-rw-r--r-- root/root usr/share/gettext/intl/libgnuintl.in.h
-rw-r--r-- root/root usr/share/gettext/intl/libintl.rc
-rw-r--r-- root/root usr/share/gettext/intl/loadinfo.h
-rw-r--r-- root/root usr/share/gettext/intl/loadmsgcat.c
@ -179,6 +179,7 @@ drwxr-xr-x root/root usr/share/gettext/intl/
-rw-r--r-- root/root usr/share/gettext/intl/vasnprintf.c
-rw-r--r-- root/root usr/share/gettext/intl/vasnprintf.h
-rw-r--r-- root/root usr/share/gettext/intl/vasnwprintf.h
-rw-r--r-- root/root usr/share/gettext/intl/verify.h
-rw-r--r-- root/root usr/share/gettext/intl/version.c
-rw-r--r-- root/root usr/share/gettext/intl/wprintf-parse.h
-rw-r--r-- root/root usr/share/gettext/intl/xsize.h

View File

@ -1 +1 @@
3dd55b952826d2b32f51308f2f91aa89 gettext-0.18.1.1.tar.gz
0c86e5af70c195ab8bd651d17d783928 gettext-0.18.2.tar.gz

View File

@ -4,14 +4,12 @@
# Depends on: ncurses acl
name=gettext
version=0.18.1.1
release=2
version=0.18.2
release=1
source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
build() {
cd $name-$version
# fix for glibc 'gets' removal
sed -i -e '/gets is a/d' $name-*/*/stdio.in.h
./configure --prefix=/usr \
--mandir=/usr/man \
--disable-csharp \
@ -22,5 +20,5 @@ build() {
make
make -j1 DESTDIR=$PKG install
rm -r $PKG/usr/share/{info,doc}
rm $PKG/usr/share/gettext/intl/{COPYING*,ChangeLog}
rm $PKG/usr/share/gettext/intl/ChangeLog
}

View File

@ -39,9 +39,16 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libiptc.pc
-rw-r--r-- root/root usr/lib/pkgconfig/xtables.pc
drwxr-xr-x root/root usr/lib/xtables/
-rwxr-xr-x root/root usr/lib/xtables/libip6t_DNAT.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_DNPT.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_HL.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_LOG.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_MASQUERADE.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_NETMAP.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_REDIRECT.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_REJECT.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_SNAT.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_SNPT.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_ah.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_dst.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_eui64.so

View File

@ -1 +1 @@
6dd40c12fb8f4c4312a0f8434369fbcd iptables-1.4.16.3.tar.bz2
c3fb2ffd5b39d0d54b06ccc4c8660116 iptables-1.4.17.tar.bz2

View File

@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=iptables
version=1.4.16.3
version=1.4.17
release=1
source=(ftp://ftp.netfilter.org/pub/iptables/$name-$version.tar.bz2)