diff options
44 files changed, 563 insertions, 1230 deletions
diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile new file mode 100644 index 000000000..0f8a9a593 --- /dev/null +++ b/package/beecrypt/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= beecrypt +PKG_VERSION:= 4.2.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 8441c014170823f2dff97e33df55af1e +PKG_DESCR:= cryptography toolkit +PKG_SECTION:= crypto +PKG_URL:= http://beecrypt.sourceforge.net/ +PKG_SITES:= http://sourceforge.net/projects/beecrypt/files/beecrypt/$(PKG_VERSION)/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,BEECRYPT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --without-cplusplus \ + --without-python \ + --without-java + +post-install: + $(INSTALL_DIR) $(IDIR_BEECRYPT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libbeecrypt*.so* \ + $(IDIR_BEECRYPT)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bogofilter/patches/patch-configure b/package/bogofilter/patches/patch-configure new file mode 100644 index 000000000..21db7d973 --- /dev/null +++ b/package/bogofilter/patches/patch-configure @@ -0,0 +1,96 @@ +--- bogofilter-1.2.2.orig/configure 2010-07-08 05:30:26.000000000 +0200 ++++ bogofilter-1.2.2/configure 2010-11-09 23:29:25.894996376 +0100 +@@ -10284,93 +10284,7 @@ $as_echo "$LIBDB" >&6; } + + saveLIBS="$LIBS" + LIBS="$LIBS $LIBDB" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if a program can be linked against Berkeley DB and run" >&5 +-$as_echo_n "checking if a program can be linked against Berkeley DB and run... " >&6; } +- if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#ifdef HAVE_INTTYPES_H +-#include <inttypes.h> +-#endif +-#include <db.h> +- +-int +-main () +-{ +- +-return 0; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- as_fn_error "Cannot run a program linked against libdb. +-Did you adjust your library search path to include your libdb?" "$LINENO" 5 +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Berkeley DB header and library versions match" >&5 +-$as_echo_n "checking if Berkeley DB header and library versions match... " >&6; } +- rm -r -f bfadtestdir +- mkdir bfadtestdir +- if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #include <stdlib.h> +- #include <stdio.h> +-#ifdef HAVE_INTTYPES_H +-#include <inttypes.h> +-#endif +- #include <db.h> + +-int +-main () +-{ +- +- int maj, min; +- (void)db_version(&maj, &min, 0); +- (void)fprintf(stderr, "headers: %d.%d, library: %d.%d\n", +- DB_VERSION_MAJOR, DB_VERSION_MINOR, maj, min); +- if (maj != DB_VERSION_MAJOR) exit(1); +- if (min != DB_VERSION_MINOR) exit(1); +- exit(0); +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- as_fn_error "db.h header file and db library version do not match." "$LINENO" 5 +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } diff --git a/package/cups/Makefile b/package/cups/Makefile index 0e48afb3a..8f764ba1b 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -22,6 +22,7 @@ $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC' + CONFIGURE_ARGS+= --with-cups-user=cups \ --with-cups-group=cups \ --disable-ldap \ diff --git a/package/firefox/Makefile b/package/firefox/Makefile index af1d59745..f3c13c704 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,16 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 3.6.10 +PKG_VERSION:= 3.6.12 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0ee5f14fd8be07513d16131027ebcb61 +PKG_MD5SUM:= 80f4d83f23a7c45fc3f1904964ea2a5a PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk+ libnotify PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx PKG_DEPENDS+= libxdamage libxfixes libidl PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 -PKG_BUILDDEP+= nspr nss jpeg libXt +PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ @@ -38,7 +38,9 @@ endif CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \ HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2" \ - ac_cv_thread_keyword=no + CPPFLAGS="-I${STAGING_DIR}/usr/include/freetype2" \ + ac_cv_thread_keyword=no \ + ac_cv_sizeof_int_p=4 CONFIGURE_ARGS+= --enable-application=browser \ --with-system-zlib \ --with-system-jpeg \ @@ -49,6 +51,7 @@ CONFIGURE_ARGS+= --enable-application=browser \ --with-glib-prefix=${STAGING_DIR}/usr \ --enable-libxul \ --disable-tests \ + --disable-libconic \ --disable-static \ --disable-gnomeui \ --disable-gnomevfs \ diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index 28035c66a..0127a7bab 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,5 +1,5 @@ ---- mozilla-1.9.2.orig/configure 2010-07-23 00:00:19.000000000 +0200 -+++ mozilla-1.9.2/configure 2010-07-30 09:52:43.000000000 +0200 +--- mozilla-1.9.2.orig/configure 2010-10-27 05:09:28.000000000 +0200 ++++ mozilla-1.9.2/configure 2010-11-11 22:26:20.594995948 +0100 @@ -3970,7 +3970,7 @@ else echo "$ac_t""yes" 1>&6 fi @@ -9,7 +9,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -21285,8 +21285,8 @@ if test -n "$CROSS_COMPILE"; then +@@ -21465,8 +21465,8 @@ if test -n "$CROSS_COMPILE"; then HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then diff --git a/package/firefox/patches/patch-content_base_src_nsContentSink_cpp b/package/firefox/patches/patch-content_base_src_nsContentSink_cpp new file mode 100644 index 000000000..a97306351 --- /dev/null +++ b/package/firefox/patches/patch-content_base_src_nsContentSink_cpp @@ -0,0 +1,10 @@ +--- mozilla-1.9.2.orig/content/base/src/nsContentSink.cpp 2010-10-27 05:01:11.000000000 +0200 ++++ mozilla-1.9.2/content/base/src/nsContentSink.cpp 2010-11-11 22:40:48.404995720 +0100 +@@ -1973,7 +1973,6 @@ nsIAtom** const kDefaultAllowedAttribute + &nsGkAtoms::nowrap, + &nsGkAtoms::open, + &nsGkAtoms::optimum, +- &nsGkAtoms::pattern, + &nsGkAtoms::placeholder, + &nsGkAtoms::pointSize, + &nsGkAtoms::prompt, diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc new file mode 100644 index 000000000..833e94185 --- /dev/null +++ b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc @@ -0,0 +1,29 @@ +--- mozilla-1.9.2.orig/ipc/chromium/src/base/debug_util_posix.cc 2010-10-27 05:01:17.000000000 +0200 ++++ mozilla-1.9.2/ipc/chromium/src/base/debug_util_posix.cc 2010-11-12 11:53:10.614327269 +0100 +@@ -114,6 +114,9 @@ void DebugUtil::BreakDebugger() { + } + + StackTrace::StackTrace() { ++#ifdef CHROMIUM_MOZILLA_BUILD ++ return; ++#else + const int kMaxCallers = 256; + + void* callers[kMaxCallers]; +@@ -128,11 +131,16 @@ StackTrace::StackTrace() { + } else { + trace_.resize(0); + } ++#endif + } + + void StackTrace::PrintBacktrace() { ++#ifdef CHROMIUM_MOZILLA_BUILD ++ return; ++#else + fflush(stderr); + backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO); ++#endif + } + + void StackTrace::OutputToStream(std::ostream* os) { diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index dfe5c0c65..dfffe8523 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -70,8 +70,9 @@ endif TCFLAGS+= -I${STAGING_DIR}/usr/include/et -pthread -CONFIGURE_ARGS+= ${CONFIGURE_OPTS} -CONFIGURE_ENV+= ac_cv_func_getaddrinfo_numserv=yes +CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_TOOLS}/bin +CONFIGURE_ENV+= cross_compiling=yes \ + ac_cv_func_getaddrinfo_numserv=yes ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe @@ -79,17 +80,23 @@ endif pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - ./configure ${CONFIGURE_OPTS} \ + ./configure --prefix=$(STAGING_TOOLS) \ + --disable-pk-init \ + --without-openldap \ + --disable-otp \ ); + ${MAKE} -C ${WRKBUILD}/include ${MAKE} -C ${WRKBUILD}/lib/roken ${MAKE} -C ${WRKBUILD}/lib/vers ${MAKE} -C ${WRKBUILD}/lib/editline ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) - ${INSTALL_BIN} ${WRKBUILD}/lib/asn1/asn1_compile$(EXEEXT) \ + ${INSTALL_BIN} ${WRKBUILD}/lib/roken/make-roken$(EXEEXT) \ ${STAGING_TOOLS}/bin ${INSTALL_BIN} ${WRKBUILD}/lib/sl/slc$(EXEEXT) \ ${STAGING_TOOLS}/bin + ${MAKE} -C ${WRKBUILD}/lib/roken install + ${MAKE} -C ${WRKBUILD}/lib/asn1 install ${MAKE} -C ${WRKBUILD}/lib/asn1 clean ${MAKE} -C ${WRKBUILD}/lib/roken clean ${MAKE} -C ${WRKBUILD} clean diff --git a/package/heimdal/patches/patch-lib_roken_Makefile_in b/package/heimdal/patches/patch-lib_roken_Makefile_in new file mode 100644 index 000000000..a702be6b7 --- /dev/null +++ b/package/heimdal/patches/patch-lib_roken_Makefile_in @@ -0,0 +1,41 @@ +--- heimdal-1.4.orig/lib/roken/Makefile.in 2010-09-13 09:24:23.000000000 +0200 ++++ heimdal-1.4/lib/roken/Makefile.in 2010-11-10 19:56:51.764995802 +0100 +@@ -726,9 +726,6 @@ getifaddrs-test$(EXEEXT): $(getifaddrs_t + hex-test$(EXEEXT): $(hex_test_OBJECTS) $(hex_test_DEPENDENCIES) + @rm -f hex-test$(EXEEXT) + $(LINK) $(hex_test_OBJECTS) $(hex_test_LDADD) $(LIBS) +-make-roken$(EXEEXT): $(make_roken_OBJECTS) $(make_roken_DEPENDENCIES) +- @rm -f make-roken$(EXEEXT) +- $(LINK) $(make_roken_OBJECTS) $(make_roken_LDADD) $(LIBS) + parse_bytes-test$(EXEEXT): $(parse_bytes_test_OBJECTS) $(parse_bytes_test_DEPENDENCIES) + @rm -f parse_bytes-test$(EXEEXT) + $(LINK) $(parse_bytes_test_OBJECTS) $(parse_bytes_test_LDADD) $(LIBS) +@@ -1977,18 +1974,18 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok + .hin.h: + cp $< $@ + +-@CROSS_COMPILE_FALSE@roken.h: make-roken$(EXEEXT) +-@CROSS_COMPILE_FALSE@ @./make-roken$(EXEEXT) > tmp.h ;\ +-@CROSS_COMPILE_FALSE@ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ +-@CROSS_COMPILE_FALSE@ else rm -f roken.h; mv tmp.h roken.h; fi ++roken.h: make-roken$(EXEEXT) ++ ./make-roken$(EXEEXT) > tmp.h ;\ ++ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ ++ else rm -f roken.h; mv tmp.h roken.h; fi + +-@CROSS_COMPILE_FALSE@make-roken.c: roken.h.in roken.awk +-@CROSS_COMPILE_FALSE@ $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c ++make-roken.c: roken.h.in roken.awk ++ $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c ++ ++make-roken$(EXEEXT): make-roken.c ++ $(HOSTCC) $(HOSTCFLAGS) -I$(top_builddir)/include -DHAVE_CONFIG_H \ ++ -o $@ $< + +-@CROSS_COMPILE_TRUE@roken.h: $(top_srcdir)/cf/roken-h-process.pl roken.h.in +-@CROSS_COMPILE_TRUE@ perl $(top_srcdir)/cf/roken-h-process.pl \ +-@CROSS_COMPILE_TRUE@ -c $(top_builddir)/include/config.h \ +-@CROSS_COMPILE_TRUE@ -p $(srcdir)/roken.h.in -o roken.h + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/package/heimdal/patches/patch-lib_roken_Makefile_in.orig b/package/heimdal/patches/patch-lib_roken_Makefile_in.orig new file mode 100644 index 000000000..7d207e474 --- /dev/null +++ b/package/heimdal/patches/patch-lib_roken_Makefile_in.orig @@ -0,0 +1,27 @@ +--- heimdal-1.4.orig/lib/roken/Makefile.in 2010-09-13 09:24:23.000000000 +0200 ++++ heimdal-1.4/lib/roken/Makefile.in 2010-11-10 18:57:00.174995995 +0100 +@@ -1977,18 +1977,13 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok + .hin.h: + cp $< $@ + +-@CROSS_COMPILE_FALSE@roken.h: make-roken$(EXEEXT) +-@CROSS_COMPILE_FALSE@ @./make-roken$(EXEEXT) > tmp.h ;\ +-@CROSS_COMPILE_FALSE@ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ +-@CROSS_COMPILE_FALSE@ else rm -f roken.h; mv tmp.h roken.h; fi +- +-@CROSS_COMPILE_FALSE@make-roken.c: roken.h.in roken.awk +-@CROSS_COMPILE_FALSE@ $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c ++roken.h: make-roken$(EXEEXT) ++ ./make-roken$(EXEEXT) > tmp.h ;\ ++ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ ++ else rm -f roken.h; mv tmp.h roken.h; fi + +-@CROSS_COMPILE_TRUE@roken.h: $(top_srcdir)/cf/roken-h-process.pl roken.h.in +-@CROSS_COMPILE_TRUE@ perl $(top_srcdir)/cf/roken-h-process.pl \ +-@CROSS_COMPILE_TRUE@ -c $(top_builddir)/include/config.h \ +-@CROSS_COMPILE_TRUE@ -p $(srcdir)/roken.h.in -o roken.h ++make-roken.c: roken.h.in roken.awk ++ $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/package/heimdal/patches/patch-lib_roken_roken_h_in b/package/heimdal/patches/patch-lib_roken_roken_h_in new file mode 100644 index 000000000..59e9a2c52 --- /dev/null +++ b/package/heimdal/patches/patch-lib_roken_roken_h_in @@ -0,0 +1,11 @@ +--- heimdal-1.4.orig/lib/roken/roken.h.in 2010-09-13 09:23:34.000000000 +0200 ++++ heimdal-1.4/lib/roken/roken.h.in 2010-11-10 19:46:45.916683899 +0100 +@@ -524,7 +524,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ge + ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL strerror(int); + #endif + +-#if (!defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R)) ++#if ( !defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R)) + int ROKEN_LIB_FUNCTION rk_strerror_r(int, char *, size_t); + #else + #define rk_strerror_r strerror_r diff --git a/package/heimdal/src/cf/roken-h-process.pl b/package/heimdal/src/cf/roken-h-process.pl new file mode 100644 index 000000000..a54c9216d --- /dev/null +++ b/package/heimdal/src/cf/roken-h-process.pl @@ -0,0 +1,181 @@ +#!/usr/bin/perl + +require 'getopts.pl'; + +my $debug = 0; + +Getopts('dc:p:o:') || die "foo"; + +if ($opt_d) { + $debug = 1; +} + +die "missing arg" if (!defined $opt_c || !defined $opt_p || !defined $opt_o); + +my %defines; +my $IN; +my $OUT; + +print "parse config.h\n" if ($debug); + +open IN, $opt_c || die "failed open ${opt_c}"; + +my @nesting; + +push @nesting, 1; + +while (<IN>) { + if (m/\s*#ifdef\s+(.*)/) { + my $var = $1; + if (defined $defines{$var}) { + push @nesting, 1; + } else { + push @nesting, 0; + } + next; + } elsif (m/\s*#ifndef\s+(.*)/) { + my $var = $1; + if (defined $defines{$var}) { + push @nesting, 0; + } else { + push @nesting, 1; + } + next; + } elsif (m/\s*#else/) { + my $var = pop @nesting; + $var = !$var; + push @nesting, $var; + next; + } elsif ($nesting[$#nesting] and m/\s*#define\s+(\w+)\s+(\S+)/) { + my $res = $2; + $res = 1 if (!defined $res); + $defines{$1} = $res; + } +} + +close IN; + +if ($debug) { + foreach my $i (keys %defines) { + print "k: $i v: $defines{$i}\n"; + } +} + +open IN, "$opt_p" || die "failed open ${opt_p}"; +open OUT, ">$opt_o" || die "failed open ${opt_o}"; + +print "parse roken.h.in\n" if ($debug); + +print OUT "/* This is an OS dependent, generated file */\n"; +print OUT "\n"; +print OUT "\n"; +print OUT "#ifndef __ROKEN_H__\n"; +print OUT "#define __ROKEN_H__\n"; +print OUT "\n"; + +@nesting = (1); + +while (<IN>) { + if (m/\s*#ifdef\s+(.*)/) { + my $var = $1; + if (defined $defines{$var}) { + push @nesting, 1; + } else { + push @nesting, 0; + } + next; + } elsif (m/\s*#ifndef\s+(.*)/) { + my $var = $1; + if (defined $defines{$var}) { + push @nesting, 0; + } else { + push @nesting, 1; + } + next; + } elsif (m/\s*#if\s+(.*)/) { + my $res = parse_if($1); + print "line = $res: $1\n" if ($debug); + push @nesting, $res; + next; + } elsif (m/\s*#elif\s+(.*)/) { + my $res = pop @nesting; + if ($res gt 0) { + $res = -1; + } else { + my $res = parse_if($1); + } + push @nesting, $res; + next; + } elsif (m/\s*#else/) { + my $var = pop @nesting; + $var = !$var; + push @nesting, $var; + next; + } elsif (m/\s*#endif/) { + pop @nesting; + next; + } + print "line: $_\n" if ($debug); + print "nesting dep $#{nesting}\n" if ($debug); + my $i = 0, $t = 1; + while ($i le $#nesting) { + $t = 0 if ($nesting[$i] le 0); + print "nesting $i val $nesting[$i] -> $t\n" if ($debug); + $i++; + } + if ($t) { + print OUT; + } +} + +print OUT "\n"; +print OUT "#endif /* __ROKEN_H__ */\n"; + + +close IN; + +exit 0; + +sub parse_if +{ + my ($neg, $var); + + $_ = shift; + + if (m/^\s*$/) { + print "end $_\n" if ($debug); + return 1; + } elsif (m/^([^&]+)\&\&(.*)$/) { + print "$1 and $2\n" if ($debug); + return parse_if($1) and parse_if($2); + } elsif (m/^([^\|]+)\|\|(.*)$/) { + print "$1 or $2\n" if ($debug); + return parse_if($1) or parse_if($2); + } elsif (m/^\s*(\!)?\s*defined\((\w+)\)/) { + ($neg, $var) = ($1, $2); + print "def: ${neg}-defined(${var})\n" if ($debug); + my $res = defined $defines{$var}; + if ($neg eq "!") { + if ($res) { + $res = 0; + } else { + $res = 1; + } + } + print "res: $res\n" if ($debug); + return $res; + } elsif (m/^\s*(\!)?(\w+)/) { + ($neg, $var) = ($1, $2); + print "var: $neg $var\n" if ($debug); + my $res; + if (defined $defines{$var}) { + $res = $defines{$var}; + } else { + $res = 0; + } + $res = ! $res if ($neg =~ m/!/); + print "res: $res\n" if ($debug); + return $res; + } + die "failed parse: $_\n"; +} diff --git a/package/libtirpc/patches/patch-src_Makefile_in b/package/libtirpc/patches/patch-src_Makefile_in index f6e41aa3b..18ce6ffe2 100644 --- a/package/libtirpc/patches/patch-src_Makefile_in +++ b/package/libtirpc/patches/patch-src_Makefile_in @@ -1,5 +1,5 @@ --- libtirpc-0.2.1.orig/src/Makefile.in 2009-11-30 15:10:21.000000000 +0100 -+++ libtirpc-0.2.1/src/Makefile.in 2010-01-13 21:28:55.000000000 +0100 ++++ libtirpc-0.2.1/src/Makefile.in 2010-11-11 10:41:48.394995633 +0100 @@ -81,8 +81,8 @@ am__libtirpc_la_SOURCES_DIST = auth_none rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \ rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \ @@ -21,6 +21,15 @@ libtirpc_la-xdr_rec.lo libtirpc_la-xdr_array.lo \ libtirpc_la-xdr_float.lo libtirpc_la-xdr_mem.lo \ libtirpc_la-xdr_reference.lo libtirpc_la-xdr_stdio.lo \ +@@ -286,7 +285,7 @@ lib_LTLIBRARIES = libtirpc.la + # release number of your package. This is an abuse that only fosters + # misunderstanding of the purpose of library versions." + # +-libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 \ ++libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 \ + $(am__append_2) + libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \ + bindresvport.c clnt_bcast.c clnt_dg.c clnt_generic.c \ @@ -297,8 +296,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \ rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \ diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 313c1fc9e..81124486c 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.74 +PKG_VERSION:= 2.02.76 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3f86b528310183cad73c81c8efda0c34 +PKG_MD5SUM:= 1a43a943c218cb00ce1a6ce39889a6ae PKG_DESCR:= logical volume management PKG_SECTION:= fs PKG_DEPENDS:= libdevmapper libncurses diff --git a/package/mrd6/patches/patch-src_linux_mrd_components_cpp b/package/mrd6/patches/patch-src_linux_mrd_components_cpp index e604a63dd..4416c29db 100644 --- a/package/mrd6/patches/patch-src_linux_mrd_components_cpp +++ b/package/mrd6/patches/patch-src_linux_mrd_components_cpp @@ -1,14 +1,59 @@ --- mrd6-0.9.6.orig/src/linux/mrd_components.cpp 2007-01-07 03:11:27.000000000 +0100 -+++ mrd6-0.9.6/src/linux/mrd_components.cpp 2009-06-19 21:49:44.000000000 +0200 -@@ -90,10 +90,8 @@ char *mrd::obtain_frame_description(void ++++ mrd6-0.9.6/src/linux/mrd_components.cpp 2010-11-11 11:16:08.114995686 +0100 +@@ -28,10 +28,6 @@ + #include <mrdpriv/linux/us_mfa.h> + #include <mrdpriv/linux/icmp_raw.h> + +-#if defined(__GLIBC__) && !defined(__UCLIBC__) +-#include <execinfo.h> +-#endif +- + bool mrd::prepare_os_components() { + m_mfa = new us_mfa(); + +@@ -57,45 +53,14 @@ const char *mrd::loopback_interface_name + #define MAX_DEEP_BACKTRACE 32 + + void mrd::output_backtrace(base_stream &out) const { +-#if defined(__GLIBC__) && !defined(__UCLIBC__) +- void *bt[MAX_DEEP_BACKTRACE]; +- +- int count = backtrace(bt, MAX_DEEP_BACKTRACE); +- +- char **btnames = backtrace_symbols(bt, count); +- +- for (int i = 0; i < count; i++) { +- out.xprintf("#%i %s\n", i+1, btnames[i]); +- } +- +- free(btnames); +-#else + out.writeline("Backtraces aren't available in this system."); +-#endif + } + + char *mrd::obtain_frame_description(void *ptr) const { +-#if defined(__GLIBC__) && !defined(__UCLIBC__) +- void *p[1] = { ptr }; +- +- char **names = backtrace_symbols(p, 1); +- char *ret = strdup(names[0]); +- free(names); +- +- return ret; +-#else + return 0; +-#endif + } void *mrd::posix_uctx::get_current_frame() const { - #if defined(__GLIBC__) +-#if defined(__GLIBC__) -#if defined(__i386__) -+#if defined(__i386__) - return (void *)base->uc_mcontext.gregs[REG_EIP]; +- return (void *)base->uc_mcontext.gregs[REG_EIP]; -#elif defined(__mips__) - return (void *)base->uc_mcontext.gpregs[CTX_EPC]; - #endif - #endif +-#endif +-#endif return 0; + } + diff --git a/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl b/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl index c56cae4e9..8ff48d3f9 100644 --- a/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl +++ b/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl @@ -1,7 +1,8 @@ --- mrd6-0.9.6.orig/src/scripts/generate-modules-cpp.pl 2007-03-22 03:37:07.000000000 +0100 -+++ mrd6-0.9.6/src/scripts/generate-modules-cpp.pl 2010-02-13 16:04:53.000000000 +0100 ++++ mrd6-0.9.6/src/scripts/generate-modules-cpp.pl 2010-11-11 10:57:10.601251127 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl - + use strict; + diff --git a/package/php/Makefile b/package/php/Makefile index be9a982ad..da9ff221d 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 5.3.2 +PKG_VERSION:= 5.3.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 4480d7c6d6b4a86de7b8ec8f0c2d1871 +PKG_MD5SUM:= 5adf1a537895c2ec933fddd48e78d8a2 PKG_DESCR:= PHP language interpreter PKG_SECTION:= lang PKG_DEPENDS:= libopenssl zlib diff --git a/package/popt/Makefile b/package/popt/Makefile index f8d43aac0..9a59abba3 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= popt -PKG_VERSION:= 1.15 -PKG_RELEASE:= 2 -PKG_MD5SUM:= c61ef795fa450eb692602a661ec8d7f1 +PKG_VERSION:= 1.16 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 3743beefa3dd6247a73f8f7a32c14c33 PKG_DESCR:= a command line option parsing library PKG_SECTION:= libs PKG_DEPENDS:= libiconv diff --git a/package/popt/patches/patch-Makefile_in b/package/popt/patches/patch-Makefile_in deleted file mode 100644 index 6b66fe02f..000000000 --- a/package/popt/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- popt-1.15.orig/Makefile.in 2009-04-12 21:31:13.000000000 +0200 -+++ popt-1.15/Makefile.in 2009-10-31 23:17:36.793465302 +0100 -@@ -80,7 +80,7 @@ libpopt_la_OBJECTS = $(am_libpopt_la_OBJ - libpopt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libpopt_la_LDFLAGS) $(LDFLAGS) -o $@ --PROGRAMS = $(noinst_PROGRAMS) -+PROGRAMS = - am_test1_OBJECTS = test1.$(OBJEXT) - test1_OBJECTS = $(am_test1_OBJECTS) - test1_DEPENDENCIES = $(usrlib_LTLIBRARIES) diff --git a/package/popt/patches/patch-po_Makefile_in b/package/popt/patches/patch-po_Makefile_in deleted file mode 100644 index 6a4819b3c..000000000 --- a/package/popt/patches/patch-po_Makefile_in +++ /dev/null @@ -1,100 +0,0 @@ ---- popt-1.15.orig/po/Makefile.in 2009-04-12 21:31:23.000000000 +0200 -+++ popt-1.15/po/Makefile.in 2009-10-31 23:15:58.617450982 +0100 -@@ -22,42 +22,42 @@ srcdir = . - top_srcdir = .. - - --prefix = /usr/local -+prefix = /usr - exec_prefix = ${prefix} - datarootdir = ${prefix}/share --datadir = ${datarootdir} -+datadir = /usr/share - localedir = ${datarootdir}/locale - gettextsrcdir = $(datadir)/gettext/po - --INSTALL = /usr/opkg/bin/ginstall -c -+INSTALL = /usr/bin/install -c - INSTALL_DATA = ${INSTALL} -m 644 - - # We use $(mkdir_p). - # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as - # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, --# $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh does not start with $(SHELL), so we add it. --# In automake >= 1.10, /usr/opkg/bin/gmkdir -p is derived from ${MKDIR_P}, which is defined -+# $(SHELL) /home/wbx/adk/build_i586/w-popt-1.15-2/popt-1.15/install-sh does not start with $(SHELL), so we add it. -+# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined - # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake - # versions, $(mkinstalldirs) and $(install_sh) are unused. --mkinstalldirs = $(SHELL) $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh -d --install_sh = $(SHELL) $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh --MKDIR_P = /usr/opkg/bin/gmkdir -p --mkdir_p = /usr/opkg/bin/gmkdir -p -+mkinstalldirs = $(SHELL) $(SHELL) /home/wbx/adk/build_i586/w-popt-1.15-2/popt-1.15/install-sh -d -+install_sh = $(SHELL) $(SHELL) /home/wbx/adk/build_i586/w-popt-1.15-2/popt-1.15/install-sh -+MKDIR_P = /bin/mkdir -p -+mkdir_p = /bin/mkdir -p - --GMSGFMT_ = /usr/opkg/bin/msgfmt --GMSGFMT_no = /usr/opkg/bin/msgfmt --GMSGFMT_yes = /usr/opkg/bin/msgfmt -+GMSGFMT_ = /usr/bin/msgfmt -+GMSGFMT_no = /usr/bin/msgfmt -+GMSGFMT_yes = /usr/bin/msgfmt - GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) --MSGFMT_ = /usr/opkg/bin/msgfmt --MSGFMT_no = /usr/opkg/bin/msgfmt --MSGFMT_yes = /usr/opkg/bin/msgfmt -+MSGFMT_ = /usr/bin/msgfmt -+MSGFMT_no = /usr/bin/msgfmt -+MSGFMT_yes = /usr/bin/msgfmt - MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) --XGETTEXT_ = /usr/opkg/bin/xgettext --XGETTEXT_no = /usr/opkg/bin/xgettext --XGETTEXT_yes = /usr/opkg/bin/xgettext -+XGETTEXT_ = /usr/bin/xgettext -+XGETTEXT_no = /usr/bin/xgettext -+XGETTEXT_yes = /usr/bin/xgettext - XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) - MSGMERGE = msgmerge --MSGMERGE_UPDATE = /usr/opkg/bin/msgmerge --update -+MSGMERGE_UPDATE = /usr/bin/msgmerge --update - MSGINIT = msginit - MSGCONV = msgconv - MSGFILTER = msgfilter -@@ -96,7 +96,7 @@ CATALOGS = @CATALOGS@ - mv t-$@ $@ - - --all: check-macro-version all-yes -+all: check-macro-version all-no - - all-yes: stamp-po - all-no: -@@ -202,7 +202,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot - - install: install-exec install-data - install-exec: --install-data: install-data-yes -+install-data: install-data-no - if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common) Makevars.template; do \ -@@ -261,7 +261,7 @@ install-strip: install - - installdirs: installdirs-exec installdirs-data - installdirs-exec: --installdirs-data: installdirs-data-yes -+installdirs-data: installdirs-data-no - if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - else \ -@@ -306,7 +306,7 @@ installcheck: - - uninstall: uninstall-exec uninstall-data - uninstall-exec: --uninstall-data: uninstall-data-yes -+uninstall-data: uninstall-data-no - if test "$(PACKAGE)" = "gettext-tools"; then \ - for file in $(DISTFILES.common) Makevars.template; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ diff --git a/package/procmail/patches/patch-Makefile_new b/package/procmail/patches/patch-Makefile_new index 695c46873..1b2785629 100644 --- a/package/procmail/patches/patch-Makefile_new +++ b/package/procmail/patches/patch-Makefile_new @@ -1,6 +1,6 @@ --- procmail-3.22.orig/Makefile.new 1970-01-01 00:00:00.000000000 +0100 -+++ procmail-3.22/Makefile.new 2009-06-04 22:43:04.000000000 +0200 -@@ -0,0 +1,16 @@ ++++ procmail-3.22/Makefile.new 2010-01-28 20:54:16.474334142 +0100 +@@ -0,0 +1,19 @@ +PM_OBJ=cstdio.o common.o exopen.o goodies.o locking.o \ + mailfold.o foldinfo.o misc.o pipes.o regexp.o robust.o \ + sublib.o acommon.o mcommon.o lastdirsep.o authenticate.o \ @@ -9,6 +9,9 @@ +FM_OBJ=common.o fields.o formisc.o sublib.o ecommon.o \ + acommon.o + ++LDFLAGS = -lm -lnsl -ldl -lc ++CFLAGS = -Os -DPROCMAIL ++ +all: procmail formail + +procmail: procmail.o $(PM_OBJ) diff --git a/package/procmail/src/Makefile.new b/package/procmail/src/Makefile.new index 3f8ed3ab2..38b092ce9 100644 --- a/package/procmail/src/Makefile.new +++ b/package/procmail/src/Makefile.new @@ -6,7 +6,7 @@ PM_OBJ=cstdio.o common.o exopen.o goodies.o locking.o \ FM_OBJ=common.o fields.o formisc.o sublib.o ecommon.o \ acommon.o -LDFLAGS = -lm -lnsl -ldl -lc +LDFLAGS = -lm -ldl -lc CFLAGS = -Os -DPROCMAIL all: procmail formail diff --git a/package/rpm/Makefile b/package/rpm/Makefile index 8bfe44011..e784dc33b 100644 --- a/package/rpm/Makefile +++ b/package/rpm/Makefile @@ -4,33 +4,33 @@ include $(TOPDIR)/rules.mk PKG_NAME:= rpm -PKG_VERSION:= 4.7.2 +PKG_VERSION:= 5.3.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 224715646325df4cd3904e3ac9e16186 +PKG_MD5SUM:= 08027af2368ecad8060f9f5bf46c2bd9 PKG_DESCR:= Package Manager PKG_SECTION:= base -PKG_BUILDDEP:= nss libdb PKG_URL:= http://www.rpm.org/ -PKG_SITES:= http://rpm.org/releases/rpm-4.7.x/ +PKG_SITES:= http://rpm5.org/files/rpm/rpm-5.3/ PKG_HOST_DEPENDS:= !cygwin !darwin PKG_TARGET_DEPENDS:= !foxboard -DISTFILES:= ${PKG_NAME}-$(PKG_VERSION).tar.bz2 - include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,RPM,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCPPFLAGS+= -I${STAGING_DIR}/usr/include/nspr \ - -I${STAGING_DIR}/usr/include/nss -CONFIGURE_ARGS:= --with-external-db \ +CONFIGURE_ENV+= ac_cv_va_copy=no +CONFIGURE_ARGS+= --with-usecrypto=BeeCrypt \ + --with-beecrypt=internal \ + --with-dbapi=db \ + --with-sqlite=none \ + --without-python \ + --without-perl \ + --without-ruby \ --without-lua post-install: - $(INSTALL_DIR) $(IDIR_RPM)/usr/bin $(IDIR_RPM)/usr/lib - $(INSTALL_DIR) $(IDIR_RPM)/usr/lib/rpm - $(INSTALL_BIN) $(WRKINST)/bin/rpm $(IDIR_RPM)/usr/bin + $(INSTALL_DIR) $(IDIR_RPM)/usr/bin $(IDIR_RPM)/usr/lib/rpm $(INSTALL_BIN) $(WRKINST)/usr/bin/rpm* $(IDIR_RPM)/usr/bin $(CP) $(WRKINST)/usr/lib/*.so* $(IDIR_RPM)/usr/lib $(CP) $(WRKINST)/usr/lib/rpm/* $(IDIR_RPM)/usr/lib/rpm diff --git a/package/rpm/patches/patch-config_guess b/package/rpm/patches/patch-config_guess deleted file mode 100644 index b5ec8f21a..000000000 --- a/package/rpm/patches/patch-config_guess +++ /dev/null @@ -1,207 +0,0 @@ ---- rpm-4.7.0.orig/config.guess 2008-08-30 00:27:10.000000000 +0200 -+++ rpm-4.7.0/config.guess 2009-06-11 17:31:39.670840385 +0200 -@@ -4,7 +4,7 @@ - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - # Free Software Foundation, Inc. - --timestamp='2008-01-23' -+timestamp='2008-09-28' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -139,6 +139,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -+if [ "${UNAME_SYSTEM}" = "Linux" ] ; then -+ eval $set_cc_for_build -+ cat << EOF > $dummy.c -+ #include <features.h> -+ #ifdef __UCLIBC__ -+ # ifdef __UCLIBC_CONFIG_VERSION__ -+ LIBC=uclibc __UCLIBC_CONFIG_VERSION__ -+ # else -+ LIBC=uclibc -+ # endif -+ #else -+ LIBC=gnu -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` -+fi -+ - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -796,7 +813,7 @@ EOF - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -- EM64T | authenticamd) -+ EM64T | authenticamd | genuineintel) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) -@@ -840,31 +857,31 @@ EOF - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi - fi - exit ;; - avr32*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo cris-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo crisv32-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo frv-unknown-linux-${LIBC} - exit ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m32r*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build -@@ -887,7 +904,7 @@ EOF - s: ::g - p - }'`" -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build -@@ -910,16 +927,16 @@ EOF - s: ::g - p - }'`" -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ echo or32-unknown-linux-${LIBC} - exit ;; - ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ echo powerpc64-unknown-linux-${LIBC} - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -932,40 +949,43 @@ EOF - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-unknown-linux-gnu ;; -- PA8*) echo hppa2.0-unknown-linux-gnu ;; -- *) echo hppa-unknown-linux-gnu ;; -+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; -+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; -+ *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ echo hppa64-unknown-linux-${LIBC} - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - vax:Linux:*:*) -- echo ${UNAME_MACHINE}-dec-linux-gnu -+ echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo x86_64-unknown-linux-${LIBC} - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so -@@ -980,20 +1000,19 @@ EOF - p'` - case "$ld_supported_targets" in - elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -+ TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" - ;; - a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" - exit ;; - esac -+ # This should get integrated into the C code below, but now we hack -+ if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -1216,6 +1235,9 @@ EOF - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; diff --git a/package/rpm/patches/patch-config_sub b/package/rpm/patches/patch-config_sub deleted file mode 100644 index 3b14117be..000000000 --- a/package/rpm/patches/patch-config_sub +++ /dev/null @@ -1,180 +0,0 @@ ---- rpm-4.7.0.orig/config.sub 2008-08-30 00:27:10.000000000 +0200 -+++ rpm-4.7.0/config.sub 2009-06-11 17:31:39.670840385 +0200 -@@ -4,7 +4,7 @@ - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - # Free Software Foundation, Inc. - --timestamp='2008-01-16' -+timestamp='2008-09-08' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -244,18 +244,20 @@ case $basic_machine in - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ -- | d10v | d30v | dlx | dsp16xx \ -+ | d10v | d30v | dlx | dsp16xx | dvp \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore | mep \ -+ | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -- | mips64vr | mips64vrel \ -+ | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -@@ -277,7 +279,7 @@ case $basic_machine in - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ -- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -@@ -286,7 +288,7 @@ case $basic_machine in - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -- | z8k) -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) -@@ -331,12 +333,14 @@ case $basic_machine in - | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -- | mips64vr-* | mips64vrel-* \ -+ | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -@@ -358,20 +362,20 @@ case $basic_machine in - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ -- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ -- | z8k-*) -+ | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) -@@ -459,6 +463,10 @@ case $basic_machine in - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -526,6 +534,10 @@ case $basic_machine in - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp -@@ -714,6 +726,24 @@ case $basic_machine in - basic_machine=m68k-atari - os=-mint - ;; -+ mipsEE* | ee | ps2) -+ basic_machine=mips64r5900el-scei -+ case $os in -+ -linux*) -+ ;; -+ *) -+ os=-elf -+ ;; -+ esac -+ ;; -+ iop) -+ basic_machine=mipsel-scei -+ os=-irx -+ ;; -+ dvp) -+ basic_machine=dvp-scei -+ os=-elf -+ ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; -@@ -1128,6 +1158,10 @@ case $basic_machine in - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1248,7 +1282,7 @@ case $os in - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ -@@ -1258,7 +1292,7 @@ case $os in - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1388,6 +1422,9 @@ case $os in - -zvmoe) - os=-zvmoe - ;; -+ -dicos*) -+ os=-dicos -+ ;; - -none) - ;; - *) diff --git a/package/rpm/patches/patch-configure b/package/rpm/patches/patch-configure deleted file mode 100644 index 7602cc370..000000000 --- a/package/rpm/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- rpm-4.7.0.orig/configure 2009-04-16 10:10:33.000000000 +0200 -+++ rpm-4.7.0/configure 2009-06-23 19:55:16.747272696 +0200 -@@ -21839,7 +21839,7 @@ if test "$GCC" = yes; then - CFLAGS="$CFLAGS -fPIC -DPIC -D_REENTRANT -Wall -Wpointer-arith -Wmissing-prototypes -Wno-char-subscripts" - # XXX disabled for now due to noise from NSPR headers - # CFLAGS="$CFLAGS -Wstrict-prototypes" -- cflags_to_try="-fno-strict-aliasing -fstack-protector" -+ cflags_to_try="-fno-strict-aliasing" - { $as_echo "$as_me:$LINENO: checking supported compiler flags" >&5 - $as_echo_n "checking supported compiler flags... " >&6; } - old_cflags=$CFLAGS diff --git a/package/rpm/patches/patch-rpmio_fts_c b/package/rpm/patches/patch-rpmio_fts_c deleted file mode 100644 index 90bed89de..000000000 --- a/package/rpm/patches/patch-rpmio_fts_c +++ /dev/null @@ -1,12 +0,0 @@ ---- rpm-4.7.0.orig/rpmio/fts.c 2009-03-03 07:51:52.000000000 +0100 -+++ rpm-4.7.0/rpmio/fts.c 2009-06-25 20:23:10.374967519 +0200 -@@ -64,6 +64,9 @@ static char sccsid[] = "@(#)fts.c 8.6 (B - #include "rpmio/fts.h" - #include <rpm/rpmio.h> - #include <rpm/rpmurl.h> -+#ifdef __UCLIBC__ -+# define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp)) -+#endif - # define __set_errno(val) (*__errno_location ()) = (val) - # define __open open - # define __close close diff --git a/package/rpm/patches/patch-rpmio_rpmio_h b/package/rpm/patches/patch-rpmio_rpmio_h deleted file mode 100644 index bb7c0b073..000000000 --- a/package/rpm/patches/patch-rpmio_rpmio_h +++ /dev/null @@ -1,12 +0,0 @@ ---- rpm-4.7.0.orig/rpmio/rpmio.h 2009-03-03 07:51:52.000000000 +0100 -+++ rpm-4.7.0/rpmio/rpmio.h 2009-06-25 20:22:25.734966728 +0200 -@@ -26,7 +26,8 @@ extern "C" { - * typedefs to isolate the lossage. - */ - #if defined(__GLIBC__) && \ -- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) -+ (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) && \ -+ !defined(__UCLIBC__) - #define USE_COOKIE_SEEK_POINTER 1 - typedef _IO_off64_t _libio_off_t; - typedef _libio_off_t * _libio_pos_t; diff --git a/package/rpm/patches/patch-rpmio_rpmsq_c b/package/rpm/patches/patch-rpmio_rpmsq_c deleted file mode 100644 index 779101b62..000000000 --- a/package/rpm/patches/patch-rpmio_rpmsq_c +++ /dev/null @@ -1,132 +0,0 @@ ---- rpm-4.7.0.orig/rpmio/rpmsq.c 2009-03-03 07:51:52.000000000 +0100 -+++ rpm-4.7.0/rpmio/rpmsq.c 2009-06-25 20:15:31.954966249 +0200 -@@ -83,6 +83,7 @@ static rpmsq rpmsqQueue = &rpmsqRock; - */ - static int rpmsqInsert(void * elem, void * prev) - { -+ sigset_t new_set, old_set; - rpmsq sq = (rpmsq) elem; - int ret = -1; - -@@ -91,7 +92,9 @@ static int rpmsqInsert(void * elem, void - if (_rpmsq_debug) - fprintf(stderr, " Insert(%p): %p\n", ME(), sq); - #endif -- ret = sighold(SIGCHLD); -+ sigemptyset(&new_set); -+ sigaddset(&new_set, SIGCHLD); -+ ret = sigprocmask(SIG_BLOCK, &new_set, &old_set); - if (ret == 0) { - sq->child = 0; - sq->reaped = 0; -@@ -102,7 +105,7 @@ fprintf(stderr, " Insert(%p): %p\n", - sq->id = ME(); - ret = pthread_mutex_init(&sq->mutex, NULL); - insque(elem, (prev != NULL ? prev : rpmsqQueue)); -- ret = sigrelse(SIGCHLD); -+ ret = sigprocmask(SIG_SETMASK, &old_set, NULL); - } - } - return ret; -@@ -115,6 +118,7 @@ fprintf(stderr, " Insert(%p): %p\n", - */ - static int rpmsqRemove(void * elem) - { -+ sigset_t new_set, old_set; - rpmsq sq = (rpmsq) elem; - int ret = -1; - -@@ -124,7 +128,9 @@ static int rpmsqRemove(void * elem) - if (_rpmsq_debug) - fprintf(stderr, " Remove(%p): %p\n", ME(), sq); - #endif -- ret = sighold (SIGCHLD); -+ sigemptyset(&new_set); -+ sigaddset(&new_set, SIGCHLD); -+ ret = sigprocmask(SIG_BLOCK, &new_set, &old_set); - if (ret == 0) { - remque(elem); - -@@ -142,7 +148,7 @@ fprintf(stderr, " Remove(%p): %p\n", - sq->reaped = 0; - sq->child = 0; - #endif -- ret = sigrelse(SIGCHLD); -+ ret = sigprocmask(SIG_SETMASK, &old_set, NULL); - } - } - return ret; -@@ -289,6 +295,7 @@ int rpmsqEnable(int signum, rpmsqAction_ - - pid_t rpmsqFork(rpmsq sq) - { -+ sigset_t new_set, old_set; - pid_t pid; - int xx; - int nothreads = 0; /* XXX: Shouldn't this be a global? */ -@@ -304,7 +311,9 @@ fprintf(stderr, " Enable(%p): %p\n", - - xx = pipe(sq->pipes); - -- xx = sighold(SIGCHLD); -+ sigemptyset(&new_set); -+ sigaddset(&new_set, SIGCHLD); -+ xx = sigprocmask(SIG_BLOCK, &new_set, &old_set); - - /* - * Initialize the cond var mutex. We have to aquire the lock we -@@ -355,7 +364,7 @@ fprintf(stderr, " Parent(%p): %p chil - } - - out: -- xx = sigrelse(SIGCHLD); -+ xx = sigprocmask(SIG_SETMASK, &old_set, NULL); - return sq->child; - } - -@@ -367,12 +376,15 @@ out: - */ - static int rpmsqWaitUnregister(rpmsq sq) - { -+ sigset_t new_set, old_set; - int nothreads = 0; - int ret = 0; - int xx; - - /* Protect sq->reaped from handler changes. */ -- ret = sighold(SIGCHLD); -+ sigemptyset(&new_set); -+ sigaddset(&new_set, SIGCHLD); -+ ret = sigprocmask(SIG_BLOCK, &new_set, &old_set); - - /* Start the child, linux often runs child before parent. */ - if (sq->pipes[0] >= 0) -@@ -388,9 +400,9 @@ static int rpmsqWaitUnregister(rpmsq sq) - while (ret == 0 && sq->reaped != sq->child) { - if (nothreads) - /* Note that sigpause re-enables SIGCHLD. */ -- ret = sigpause(SIGCHLD); -+ ret = sigsuspend(&new_set); - else { -- xx = sigrelse(SIGCHLD); -+ xx = sigprocmask(SIG_SETMASK, &old_set, NULL); - - /* - * We start before the fork with this mutex locked; -@@ -398,14 +410,14 @@ static int rpmsqWaitUnregister(rpmsq sq) - * So if we get the lock the child has been reaped. - */ - ret = pthread_mutex_lock(&sq->mutex); -- xx = sighold(SIGCHLD); -+ xx = sigprocmask(SIG_BLOCK, &new_set, &old_set); - } - } - - /* Accumulate stopwatch time spent waiting, potential performance gain. */ - sq->ms_scriptlets += rpmswExit(&sq->op, -1)/1000; - -- xx = sigrelse(SIGCHLD); -+ xx = sigprocmask(SIG_SETMASK, &old_set, NULL); - - #ifdef _RPMSQ_DEBUG - if (_rpmsq_debug) diff --git a/package/rrs/Makefile b/package/rrs/Makefile index fdc4aba3b..2b2dca293 100644 --- a/package/rrs/Makefile +++ b/package/rrs/Makefile @@ -29,7 +29,7 @@ do-build: ${MAKE} -C ${WRKBUILD} \ CC="${TARGET_CC}" \ CFLAGS="${TARGET_CFLAGS} -I${STAGING_DIR}/usr/include ${PKG_FLAGS}" \ - LDFLAGS="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib ${PKG_LDFLAGS} -lutil -lssl -lcrypto -lz" \ + LDFLAGS="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib ${PKG_LDFLAGS} -lutil -lssl -lcrypto -lz -lstdc++" \ generic do-install: diff --git a/package/rtsp/src/nf_conntrack_rtsp.c b/package/rtsp/src/nf_conntrack_rtsp.c index 7b5d2be67..75aada89b 100644 --- a/package/rtsp/src/nf_conntrack_rtsp.c +++ b/package/rtsp/src/nf_conntrack_rtsp.c @@ -369,10 +369,10 @@ help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen, //exp->mask.dst.u.udp.port = 0xfffe; } - pr_debug("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n", - NIPQUAD(exp->tuple.src.u3.ip), + pr_debug("expect_related %pI4:%u-%pI4:%u\n", + exp->tuple.src.u3.ip, ntohs(exp->tuple.src.u.udp.port), - NIPQUAD(exp->tuple.dst.u3.ip), + exp->tuple.dst.u3.ip, ntohs(exp->tuple.dst.u.udp.port)); nf_nat_rtsp = rcu_dereference(nf_nat_rtsp_hook); diff --git a/package/rtsp/src/nf_nat_rtsp.c b/package/rtsp/src/nf_nat_rtsp.c index adb44d0ae..9683e3c75 100644 --- a/package/rtsp/src/nf_nat_rtsp.c +++ b/package/rtsp/src/nf_nat_rtsp.c @@ -139,8 +139,8 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo, t = &exp->tuple; t->dst.u3.ip = newip; - extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip)) - : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip)); + extaddrlen = extip ? sprintf(szextaddr, "%pI4", extip) + : sprintf(szextaddr, "%pI4", newip); pr_debug("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto")); rbuf1len = rbufalen = 0; @@ -483,8 +483,8 @@ static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp) //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip; newip = newdstip; - pr_debug("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n", - NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip)); + pr_debug("newsrcip=%pI4, newdstip=%pI4, newip=%pI4\n", + newsrcip, newdstip, newip); mr.rangesize = 1; // We don't want to manip the per-protocol, just the IPs. diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index ac11b5520..1ebf3a17d 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= openssl PKG_URL:= http://sipsak.org/ PKG_SITES:= http://download.berlios.de/sipsak/ +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-1.tar.gz + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SIPSAK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile index fb042c6b0..0f7516b45 100644 --- a/package/tcp_wrappers/Makefile +++ b/package/tcp_wrappers/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e6fa25f71226d090f34de3f6b122fb5a PKG_DESCR:= IP based access control PKG_SECTION:= libs +PKG_URL:= ftp://ftp.porcupine.org/pub/security/index.html PKG_SITES:= ftp://ftp.porcupine.org/pub/security/ PKG_NOPARALLEL:= 1 diff --git a/package/tcp_wrappers/patches/patch-cflags b/package/tcp_wrappers/patches/patch-cflags index 3748203fe..0581a2679 100644 --- a/package/tcp_wrappers/patches/patch-cflags +++ b/package/tcp_wrappers/patches/patch-cflags @@ -1,4 +1,4 @@ --- tcp_wrappers_7.6.orig/cflags 1970-01-01 00:00:00.000000000 +0100 -+++ tcp_wrappers_7.6/cflags 2009-06-05 18:45:36.000000000 +0200 ++++ tcp_wrappers_7.6/cflags 2010-11-11 20:03:51.771239624 +0100 @@ -0,0 +1 @@ -+-fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -fstack-protector-all -DFACILITY=LOG_DAEMON -DHOSTS_ACCESS -DDAEMON_UMASK=022 -DREAL_DAEMON_DIR="/usr/sbin" -DPROCESS_OPTIONS -DKILL_IP_OPTIONS -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DHOSTS_DENY="/etc/hosts.deny" -DHOSTS_ALLOW="/etc/hosts.allow" -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len ++-fno-ident -march=pentium-m -fomit-frame-pointer -O2 -pipe -fwrapv -DFACILITY=LOG_DAEMON -DHOSTS_ACCESS -DDAEMON_UMASK=022 -DREAL_DAEMON_DIR="/usr/sbin" -DPROCESS_OPTIONS -DKILL_IP_OPTIONS -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DHOSTS_DENY="/etc/hosts.deny" -DHOSTS_ALLOW="/etc/hosts.allow" -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len diff --git a/package/tcp_wrappers/patches/patch-scaffold_c b/package/tcp_wrappers/patches/patch-scaffold_c index 40b7de4f7..2f8fb8ea5 100644 --- a/package/tcp_wrappers/patches/patch-scaffold_c +++ b/package/tcp_wrappers/patches/patch-scaffold_c @@ -1,5 +1,14 @@ --- tcp_wrappers_7.6.orig/scaffold.c 1997-03-21 19:27:24.000000000 +0100 -+++ tcp_wrappers_7.6/scaffold.c 2009-06-05 18:45:03.000000000 +0200 ++++ tcp_wrappers_7.6/scaffold.c 2010-11-11 20:08:39.264995798 +0100 +@@ -25,7 +25,7 @@ static char sccs_id[] = "@(#) scaffold.c + #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ + #endif + +-extern char *malloc(); ++//extern char *malloc(); + + /* Application-specific. */ + @@ -180,10 +180,12 @@ struct request_info *request; /* ARGSUSED */ diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile index 024eb0985..50e4d30db 100644 --- a/package/xf86-video-intel/Makefile +++ b/package/xf86-video-intel/Makefile @@ -19,6 +19,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XF86_VIDEO_INTEL,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ARGS+= --enable-dri + post-install: ${INSTALL_DIR} ${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/intel_drv.so \ diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 51af09a4c..6afc5e705 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= xfsprogs -PKG_VERSION:= 3.1.1 +PKG_VERSION:= 3.1.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= c2308b46ee707597ac50aae418d321b8 +PKG_MD5SUM:= 74081975f148bcabcab26c4c3496ede9 PKG_DESCR:= Utilities for XFS filesystems PKG_SECTION:= fs PKG_DEPENDS:= libuuid libpthread diff --git a/package/xfsprogs/patches/patch-configure b/package/xfsprogs/patches/patch-configure deleted file mode 100644 index e8068cfba..000000000 --- a/package/xfsprogs/patches/patch-configure +++ /dev/null @@ -1,370 +0,0 @@ ---- xfsprogs-3.1.1.orig/configure 2010-01-29 21:33:34.000000000 +0100 -+++ xfsprogs-3.1.1/configure 2010-02-14 00:02:10.000000000 +0100 -@@ -6404,7 +6404,7 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(CONFIG_SHELL) $(top_builddir)/libtool' - - - -@@ -11216,7 +11216,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION" - - -- pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'` -+ pkg_platform=linux - test -z "$PLATFORM" || pkg_platform="$PLATFORM" - - -@@ -12602,349 +12602,6 @@ fi - - - --for ac_header in aio.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi -- --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- if test $ac_cv_header_aio_h = no; then -- echo -- echo 'FATAL ERROR: could not find a valid <aio.h> header.' -- exit 1 -- fi -- -- --for ac_func in lio_listio --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef $ac_func -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -- --int --main () --{ --return $ac_func (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- --fi --done -- -- if test $ac_cv_func_lio_listio = yes; then -- librt="" -- else -- --{ $as_echo "$as_me:$LINENO: checking for lio_listio in -lrt" >&5 --$as_echo_n "checking for lio_listio in -lrt... " >&6; } --if test "${ac_cv_lib_rt_lio_listio+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lrt $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char lio_listio (); --int --main () --{ --return lio_listio (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_rt_lio_listio=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_rt_lio_listio=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_lio_listio" >&5 --$as_echo "$ac_cv_lib_rt_lio_listio" >&6; } --if test "x$ac_cv_lib_rt_lio_listio" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBRT 1 --_ACEOF -- -- LIBS="-lrt $LIBS" -- --else -- -- echo -- echo 'FATAL ERROR: could not find a library with lio_listio.' -- exit 1 --fi -- -- librt="-lrt" -- fi -- -- -- -- -- -- - for ac_header in uuid.h sys/uuid.h uuid/uuid.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/package/xfsprogs/patches/patch-copy_xfs_copy_c b/package/xfsprogs/patches/patch-copy_xfs_copy_c deleted file mode 100644 index f5205398e..000000000 --- a/package/xfsprogs/patches/patch-copy_xfs_copy_c +++ /dev/null @@ -1,80 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- xfsprogs-3.0.0.orig/copy/xfs_copy.c 2009-02-04 23:29:25.000000000 +0100 -+++ xfsprogs-3.0.0/copy/xfs_copy.c 2009-03-27 11:40:33.000000000 +0100 -@@ -240,7 +240,10 @@ handler(int sig) - { - pid_t pid = getpid(); - int status, i; -+ struct sigaction action; - -+ action.sa_handler = handler; -+ action.sa_flags = 0; - pid = wait(&status); - - kids--; -@@ -272,7 +275,7 @@ handler(int sig) - pthread_exit(NULL); - } - -- signal(SIGCHLD, handler); -+ sigaction(SIGCHLD, &action, NULL); - return; - } else { - /* it just croaked it bigtime, log it */ -@@ -294,7 +297,7 @@ handler(int sig) - do_warn(_("%s: Unknown child died (should never happen!)\n"), progname); - die_perror(); - pthread_exit(NULL); -- signal(SIGCHLD, handler); -+ sigaction(SIGCHLD, &action, NULL); - } - - void -@@ -467,6 +470,10 @@ void - write_wbuf(void) - { - int i; -+ sigset_t unblock, initial; -+ -+ sigemptyset(&unblock); -+ sigaddset(&unblock, SIGCHLD); - - /* verify target threads */ - for (i = 0; i < num_targets; i++) -@@ -478,9 +485,9 @@ write_wbuf(void) - if (target[i].state != INACTIVE) - pthread_mutex_unlock(&targ[i].wait); /* wake up */ - -- sigrelse(SIGCHLD); -+ sigprocmask(SIG_UNBLOCK, &unblock, &initial); - pthread_mutex_lock(&mainwait); -- sighold(SIGCHLD); -+ sigprocmask(SIG_SETMASK, &initial, NULL); - } - - -@@ -521,6 +528,11 @@ main(int argc, char **argv) - libxfs_init_t xargs; - thread_args *tcarg; - struct stat64 statbuf; -+ struct sigaction saction; -+ sigset_t sigblock, initial; -+ -+ saction.sa_handler = handler; -+ saction.sa_flags = 0; - - progname = basename(argv[0]); - -@@ -846,8 +858,10 @@ main(int argc, char **argv) - - /* set up sigchild signal handler */ - -- signal(SIGCHLD, handler); -- sighold(SIGCHLD); -+ sigaction(SIGCHLD, &saction, NULL); -+ sigemptyset(&sigblock); -+ sigaddset(&sigblock, SIGCHLD); -+ sigprocmask(SIG_BLOCK, &sigblock, &initial); - - /* make children */ - diff --git a/package/xfsprogs/patches/patch-include_buildmacros b/package/xfsprogs/patches/patch-include_buildmacros deleted file mode 100644 index ad07f23d2..000000000 --- a/package/xfsprogs/patches/patch-include_buildmacros +++ /dev/null @@ -1,11 +0,0 @@ ---- xfsprogs-3.1.1.orig/include/buildmacros 2010-01-29 20:46:13.000000000 +0100 -+++ xfsprogs-3.1.1/include/buildmacros 2010-02-13 23:57:06.000000000 +0100 -@@ -32,7 +32,7 @@ OBJECTS = $(ASFILES:.s=.o) \ - - INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) - --SHELL = /bin/sh -+SHELL ?= bash - IMAGES_DIR = $(TOPDIR)/all-images - DIST_DIR = $(TOPDIR)/dist - diff --git a/package/xfsprogs/patches/patch-libxfs_linux_c b/package/xfsprogs/patches/patch-libxfs_linux_c deleted file mode 100644 index a2cd55bd4..000000000 --- a/package/xfsprogs/patches/patch-libxfs_linux_c +++ /dev/null @@ -1,37 +0,0 @@ ---- xfsprogs-3.1.1.orig/libxfs/linux.c 2010-01-29 20:46:13.000000000 +0100 -+++ xfsprogs-3.1.1/libxfs/linux.c 2010-02-13 23:45:27.000000000 +0100 -@@ -20,8 +20,6 @@ - #include <xfs/libxfs.h> - #include <mntent.h> - #include <sys/stat.h> --#undef ustat --#include <sys/ustat.h> - #include <sys/mount.h> - #include <sys/ioctl.h> - #include <sys/sysinfo.h> -@@ -49,25 +47,6 @@ static int max_block_alignment; - int - platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose) - { -- /* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */ -- struct ustat ust[2]; -- struct stat64 st; -- -- if (!s) { -- if (stat64(block, &st) < 0) -- return 0; -- if ((st.st_mode & S_IFMT) != S_IFBLK) -- return 0; -- s = &st; -- } -- -- if (ustat(s->st_rdev, ust) >= 0) { -- if (verbose) -- fprintf(stderr, -- _("%s: %s contains a mounted filesystem\n"), -- progname, name); -- return 1; -- } - return 0; - } - diff --git a/package/xfsprogs/patches/patch-repair_Makefile b/package/xfsprogs/patches/patch-repair_Makefile deleted file mode 100644 index 43b1964ad..000000000 --- a/package/xfsprogs/patches/patch-repair_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- xfsprogs-3.1.1.orig/repair/Makefile 2010-01-29 20:46:13.000000000 +0100 -+++ xfsprogs-3.1.1/repair/Makefile 2010-02-14 00:07:38.000000000 +0100 -@@ -20,7 +20,7 @@ CFILES = agheader.c attr_repair.c avl.c - progress.c prefetch.c rt.c sb.c scan.c threads.c \ - versions.c xfs_repair.c - --LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) -+LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) -lrt - LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) - LLDFLAGS = -static diff --git a/toolchain/eglibc/eglibc.config b/toolchain/eglibc/eglibc.config index 102bfc039..ea6c01a1e 100644 --- a/toolchain/eglibc/eglibc.config +++ b/toolchain/eglibc/eglibc.config @@ -33,7 +33,7 @@ OPTION_EGLIBC_LOCALE_CODE = y OPTION_EGLIBC_MEMUSAGE = y OPTION_EGLIBC_NIS = n OPTION_EGLIBC_NSSWITCH = y -OPTION_EGLIBC_RCMD = n +OPTION_EGLIBC_RCMD = y OPTION_EGLIBC_RTLD_DEBUG = y OPTION_EGLIBC_SPAWN = y OPTION_EGLIBC_STREAMS = y |