diff options
-rw-r--r-- | package/Pacemaker-Python-GUI/Makefile | 8 | ||||
-rw-r--r-- | package/feh/Makefile | 5 | ||||
-rw-r--r-- | package/pacemaker/Makefile | 2 | ||||
-rw-r--r-- | package/pam/Makefile | 2 | ||||
-rw-r--r-- | package/pam/patches/patch-configure | 11 | ||||
-rw-r--r-- | package/pam/patches/patch-modules_pam_group_pam_group_c | 12 | ||||
-rw-r--r-- | package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c | 52 | ||||
-rw-r--r-- | package/pam/patches/patch-modules_pam_time_pam_time_c | 13 | ||||
-rw-r--r-- | package/pam/patches/patch-modules_pam_timestamp_hmacfile | 107 | ||||
-rw-r--r-- | package/vsftpd/Makefile | 9 | ||||
-rw-r--r-- | package/vsftpd/patches/patch-Makefile | 6 | ||||
-rw-r--r-- | package/vsftpd/patches/patch-builddefs_h | 11 | ||||
-rw-r--r-- | scripts/scan-pkgs.sh | 11 |
13 files changed, 236 insertions, 13 deletions
diff --git a/package/Pacemaker-Python-GUI/Makefile b/package/Pacemaker-Python-GUI/Makefile index 616fa9360..5a412863e 100644 --- a/package/Pacemaker-Python-GUI/Makefile +++ b/package/Pacemaker-Python-GUI/Makefile @@ -13,6 +13,9 @@ PKG_BUILDDEP:= pacemaker gnutls pam PKG_URL:= http://hg.clusterlabs.org/pacemaker/pygui/ PKG_SITES:= http://openadk.org/distfiles/ +PKG_CFLINE_PACEMAKER_PYTHON_GUI:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +PKG_CFLINE_PACEMAKER_MGMTD:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC + PKG_SUBPKGS:= PACEMAKER_PYTHON_GUI PACEMAKER_MGMTD PKGSD_PACEMAKER_MGMTD:= Management daemon for Pacemaker GUI @@ -31,9 +34,12 @@ TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/python2.7 \ pacemaker-python-gui-install: $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui + $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui $(CP) $(WRKINST)/usr/lib/heartbeat-gui/* \ $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui - $(INSTALL_BIN) $(WRKINST)/usr/bin/hb_gui \ + $(CP) $(WRKINST)/usr/share/heartbeat-gui/* \ + $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui + $(CP) $(WRKINST)/usr/bin/*_gui \ $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin pacemaker-mgmtd-install: diff --git a/package/feh/Makefile b/package/feh/Makefile index 66a86dacb..43a90b8b7 100644 --- a/package/feh/Makefile +++ b/package/feh/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1bb080c7b0021db50884a52161251990 PKG_DESCR:= image viewer PKG_SECTION:= multimedia +PKG_BUILDDEP:= imlib2 giblib libXt PKG_DEPENDS:= imlib2 giblib -PKG_BUILDDEP:= imlib2 giblib PKG_SITES:= http://feh.finalrewind.org/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -25,7 +25,6 @@ MAKE_FLAGS+= curl=0 xinerama=0 feh-install: $(INSTALL_DIR) $(IDIR_FEH)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/feh \ - $(IDIR_FEH)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/feh $(IDIR_FEH)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile index 25dc896ff..5d2fe2959 100644 --- a/package/pacemaker/Makefile +++ b/package/pacemaker/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= bfe2127d31e5244d0106a5c290fd0dc2 PKG_DESCR:= scalable High-Availability cluster resource manager PKG_SECTION:= ha -PKG_BUILDDEP:= resource-agents cluster-glue pam gnutls +PKG_BUILDDEP:= resource-agents cluster-glue pam gnutls corosync PKG_DEPENDS:= python2 python2-readline python2-bzip2 cluster-glue PKG_DEPENDS+= bash resource-agents pam libgnutls glib libxslt libxml2 PKG_URL:= http://www.clusterlabs.org/ diff --git a/package/pam/Makefile b/package/pam/Makefile index a9381495e..4fb90e26a 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -19,6 +19,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +XAKE_FLAGS+= GCC_HONOUR_COPTS=s + pam-install: $(INSTALL_DIR) $(IDIR_PAM)/etc/security $(CP) $(WRKINST)/etc/security/* $(IDIR_PAM)/etc/security diff --git a/package/pam/patches/patch-configure b/package/pam/patches/patch-configure new file mode 100644 index 000000000..728ff6492 --- /dev/null +++ b/package/pam/patches/patch-configure @@ -0,0 +1,11 @@ +--- Linux-PAM-1.1.4.orig/configure 2011-06-24 12:48:18.000000000 +0200 ++++ Linux-PAM-1.1.4/configure 2011-10-12 14:51:42.323559002 +0200 +@@ -2766,8 +2766,6 @@ then + if test ${libdir} = '${exec_prefix}/lib' + then + case "`uname -m`" in +- x86_64|ppc64|s390x|sparc64) +- libdir="/lib64" ;; + *) + libdir="/lib" ;; + esac diff --git a/package/pam/patches/patch-modules_pam_group_pam_group_c b/package/pam/patches/patch-modules_pam_group_pam_group_c new file mode 100644 index 000000000..40c1897d2 --- /dev/null +++ b/package/pam/patches/patch-modules_pam_group_pam_group_c @@ -0,0 +1,12 @@ +--- Linux-PAM-1.1.4.orig/modules/pam_group/pam_group.c 2011-06-21 11:04:56.000000000 +0200 ++++ Linux-PAM-1.1.4/modules/pam_group/pam_group.c 2011-10-12 14:31:55.693559001 +0200 +@@ -656,7 +656,8 @@ static int check_account(pam_handle_t *p + } + /* If buffer starts with @, we are using netgroups */ + if (buffer[0] == '@') +- good &= innetgr (&buffer[1], NULL, user, NULL); ++ pam_syslog(pamh, LOG_ERR, "%s: no netgroup supported by C library", PAM_GROUP_CONF); ++ //good &= innetgr (&buffer[1], NULL, user, NULL); + /* otherwise, if the buffer starts with %, it's a UNIX group */ + else if (buffer[0] == '%') + good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]); diff --git a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c b/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c new file mode 100644 index 000000000..5bb75c711 --- /dev/null +++ b/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c @@ -0,0 +1,52 @@ +--- Linux-PAM-1.1.4.orig/modules/pam_succeed_if/pam_succeed_if.c 2011-06-21 11:04:56.000000000 +0200 ++++ Linux-PAM-1.1.4/modules/pam_succeed_if/pam_succeed_if.c 2011-10-12 14:36:33.843559001 +0200 +@@ -230,6 +230,7 @@ evaluate_notingroup(pam_handle_t *pamh, + return PAM_AUTH_ERR; + } + /* Return PAM_SUCCESS if the (host,user) is in the netgroup. */ ++/* + static int + evaluate_innetgr(const char *host, const char *user, const char *group) + { +@@ -237,7 +238,9 @@ evaluate_innetgr(const char *host, const + return PAM_SUCCESS; + return PAM_AUTH_ERR; + } ++*/ + /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */ ++/* + static int + evaluate_notinnetgr(const char *host, const char *user, const char *group) + { +@@ -245,6 +248,7 @@ evaluate_notinnetgr(const char *host, co + return PAM_SUCCESS; + return PAM_AUTH_ERR; + } ++*/ + + /* Match a triple. */ + static int +@@ -357,19 +361,23 @@ evaluate(pam_handle_t *pamh, int debug, + return evaluate_notingroup(pamh, user, right); + } + /* (Rhost, user) is in this netgroup. */ ++ /* + if (strcasecmp(qual, "innetgr") == 0) { + const void *rhost; + if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS) + rhost = NULL; + return evaluate_innetgr(rhost, user, right); + } ++ */ + /* (Rhost, user) is not in this group. */ ++ /* + if (strcasecmp(qual, "notinnetgr") == 0) { + const void *rhost; + if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS) + rhost = NULL; + return evaluate_notinnetgr(rhost, user, right); + } ++ */ + /* Fail closed. */ + return PAM_SERVICE_ERR; + } diff --git a/package/pam/patches/patch-modules_pam_time_pam_time_c b/package/pam/patches/patch-modules_pam_time_pam_time_c new file mode 100644 index 000000000..e57094beb --- /dev/null +++ b/package/pam/patches/patch-modules_pam_time_pam_time_c @@ -0,0 +1,13 @@ +--- Linux-PAM-1.1.4.orig/modules/pam_time/pam_time.c 2011-06-21 11:04:56.000000000 +0200 ++++ Linux-PAM-1.1.4/modules/pam_time/pam_time.c 2011-10-12 14:43:20.673559001 +0200 +@@ -555,7 +555,9 @@ check_account(pam_handle_t *pamh, const + } + /* If buffer starts with @, we are using netgroups */ + if (buffer[0] == '@') +- good &= innetgr (&buffer[1], NULL, user, NULL); ++ //good &= innetgr (&buffer[1], NULL, user, NULL); ++ pam_syslog(pamh, LOG_ERR, ++ "%s: no netgroup support in C library", PAM_TIME_CONF); + else + good &= logic_field(pamh, user, buffer, count, is_same); + D(("with user: %s", good ? "passes":"fails" )); diff --git a/package/pam/patches/patch-modules_pam_timestamp_hmacfile b/package/pam/patches/patch-modules_pam_timestamp_hmacfile new file mode 100644 index 000000000..6826e3493 --- /dev/null +++ b/package/pam/patches/patch-modules_pam_timestamp_hmacfile @@ -0,0 +1,107 @@ +--- Linux-PAM-1.1.4.orig/modules/pam_timestamp/hmacfile 2011-06-21 11:37:55.000000000 +0200 ++++ Linux-PAM-1.1.4/modules/pam_timestamp/hmacfile 2011-10-12 14:45:28.323559001 +0200 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + + # hmacfile - temporary wrapper script for .libs/hmacfile + # Generated by ltmain.sh (GNU libtool) 2.2.6 +@@ -11,7 +11,7 @@ + + # Sed substitution that helps us do robust quoting. It backslashifies + # metacharacters that are still active within double-quoted strings. +-Xsed='/bin/sed -e 1s/^X//' ++Xsed='/home/wbx/adk/perf/scripts/sed -e 1s/^X//' + sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + + # Be Bourne compatible +@@ -32,13 +32,13 @@ DUALCASE=1; export DUALCASE # for MKS sh + # if CDPATH is set. + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +-relink_command="" ++relink_command="(cd /home/wbx/adk/perf/build_pcengines-alix1c_i586_uclibc/w-pam-1.1.4-1/Linux-PAM-1.1.4/modules/pam_timestamp; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=/home/wbx/adk/perf/scripts:/home/wbx/adk/perf/bin/tools:/home/wbx/adk/perf/host_i586_uclibc/bin:/home/wbx/adk/perf/host_i586_uclibc/usr/bin:/home/wbx/adk/perf/target_i586_uclibc/scripts:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games; export PATH; /home/wbx/adk/perf/host_i586_uclibc/bin/i586-openadk-linux-uclibc-gcc -I../../libpam/include -I../../libpamc/include -march=geode -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/perf/target_i586_uclibc/usr/lib -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -o \$progdir/\$file hmacfile.o hmacsha1.o sha1.o -L/home/wbx/adk/perf/target_i586_uclibc/lib -L/home/wbx/adk/perf/target_i586_uclibc/usr/lib -L/home/wbx/adk/perf/build_pcengines-alix1c_i586_uclibc/w-pam-1.1.4-1/Linux-PAM-1.1.4/libpam /home/wbx/adk/perf/build_pcengines-alix1c_i586_uclibc/w-pam-1.1.4-1/Linux-PAM-1.1.4/libpam/.libs/libpam.so -ldl -Wl,-rpath -Wl,/home/wbx/adk/perf/build_pcengines-alix1c_i586_uclibc/w-pam-1.1.4-1/Linux-PAM-1.1.4/libpam/.libs -Wl,-rpath -Wl,/lib64)" + + # This environment variable determines our operation mode. + if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then + # install mode needs the following variables: + generated_by_libtool_version='2.2.6' +- notinst_deplibs=' /data/git/Linux-PAM/libpam/libpam.la' ++ notinst_deplibs=' /home/wbx/adk/perf/build_pcengines-alix1c_i586_uclibc/w-pam-1.1.4-1/Linux-PAM-1.1.4/libpam/libpam.la' + else + # When we are sourced in execute mode, $file and $ECHO are already set. + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then +@@ -53,7 +53,7 @@ else + : + else + # Restart under the correct shell, and then maybe $ECHO will work. +- exec /bin/sh "$0" --no-reexec ${1+"$@"} ++ exec /bin/bash "$0" --no-reexec ${1+"$@"} + fi + fi + +@@ -62,7 +62,7 @@ else + test "x$thisdir" = "x$file" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. +- file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'` ++ file=`ls -ld "$file" | /home/wbx/adk/perf/scripts/sed -n 's/.*-> //p'` + while test -n "$file"; do + destdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'` + +@@ -75,7 +75,7 @@ else + fi + + file=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'` +- file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'` ++ file=`ls -ld "$thisdir/$file" | /home/wbx/adk/perf/scripts/sed -n 's/.*-> //p'` + done + + +@@ -98,20 +98,38 @@ else + absdir=`cd "$thisdir" && pwd` + test -n "$absdir" && thisdir="$absdir" + +- program='hmacfile' ++ program=lt-'hmacfile' + progdir="$thisdir/.libs" + ++ if test ! -f "$progdir/$program" || ++ { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /home/wbx/adk/perf/scripts/sed 1q`; \ ++ test "X$file" != "X$progdir/$program"; }; then + +- if test -f "$progdir/$program"; then +- # Add our own library path to LD_LIBRARY_PATH +- LD_LIBRARY_PATH="/data/git/Linux-PAM/libpam/.libs:$LD_LIBRARY_PATH" ++ file="$$-$program" + +- # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH +- # The second colon is a workaround for a bug in BeOS R4 sed +- LD_LIBRARY_PATH=`$ECHO "X$LD_LIBRARY_PATH" | $Xsed -e 's/::*$//'` ++ if test ! -d "$progdir"; then ++ mkdir "$progdir" ++ else ++ rm -f "$progdir/$file" ++ fi + +- export LD_LIBRARY_PATH ++ # relink executable if necessary ++ if test -n "$relink_command"; then ++ if relink_command_output=`eval $relink_command 2>&1`; then : ++ else ++ echo "$relink_command_output" >&2 ++ rm -f "$progdir/$file" ++ exit 1 ++ fi ++ fi ++ ++ mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null || ++ { rm -f "$progdir/$program"; ++ mv -f "$progdir/$file" "$progdir/$program"; } ++ rm -f "$progdir/$file" ++ fi + ++ if test -f "$progdir/$program"; then + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + # Run the actual program with our arguments. + diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 61e1f80da..a275f1aad 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -4,25 +4,24 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vsftpd -PKG_VERSION:= 2.2.0 +PKG_VERSION:= 2.3.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= e4eb190af270ae65d57a84274a38ec31 +PKG_MD5SUM:= 2ea5d19978710527bb7444d93b67767a PKG_DESCR:= a fast and secure FTP server PKG_SECTION:= www PKG_URL:= http://vsftpd.beasts.org/ -PKG_SITES:= ftp://vsftpd.beasts.org/users/cevans/ +PKG_SITES:= http://security.appspot.com/downloads/ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,VSFTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual - ALL_TARGET:= vsftpd post-install: ${INSTALL_DIR} ${IDIR_VSFTPD}/etc ${IDIR_VSFTPD}/usr/sbin ${INSTALL_DATA} ./files/vsftpd.conf ${IDIR_VSFTPD}/etc/vsftpd.conf - ${INSTALL_BIN} ${WRKINST}/usr/sbin/vsftpd ${IDIR_VSFTPD}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/usr/sbin/vsftpd ${IDIR_VSFTPD}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/vsftpd/patches/patch-Makefile b/package/vsftpd/patches/patch-Makefile index a6ebc0f30..83d21ca48 100644 --- a/package/vsftpd/patches/patch-Makefile +++ b/package/vsftpd/patches/patch-Makefile @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- vsftpd-2.2.0.orig/Makefile 2009-05-22 21:44:52.000000000 +0200 -+++ vsftpd-2.2.0/Makefile 2009-08-21 00:46:32.980346849 +0200 +--- vsftpd-2.3.4.orig/Makefile 2009-05-22 21:44:52.000000000 +0200 ++++ vsftpd-2.3.4/Makefile 2011-10-13 21:01:57.600352003 +0200 @@ -1,12 +1,12 @@ # Makefile for systems with GNU tools -CC = gcc @@ -27,7 +27,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ .c.o: $(CC) -c $*.c $(CFLAGS) $(IFLAGS) -@@ -24,21 +26,20 @@ vsftpd: $(OBJS) +@@ -24,21 +26,20 @@ vsftpd: $(OBJS) $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS) install: diff --git a/package/vsftpd/patches/patch-builddefs_h b/package/vsftpd/patches/patch-builddefs_h new file mode 100644 index 000000000..f44129e15 --- /dev/null +++ b/package/vsftpd/patches/patch-builddefs_h @@ -0,0 +1,11 @@ +--- vsftpd-2.3.4.orig/builddefs.h 2010-08-06 02:50:31.000000000 +0200 ++++ vsftpd-2.3.4/builddefs.h 2011-10-13 21:06:37.080352120 +0200 +@@ -2,7 +2,7 @@ + #define VSF_BUILDDEFS_H + + #undef VSF_BUILD_TCPWRAPPERS +-#define VSF_BUILD_PAM ++#undef VSF_BUILD_PAM + #undef VSF_BUILD_SSL + + #endif /* VSF_BUILDDEFS_H */ diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 0eeeeaf7c..0bf8f5808 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -133,6 +133,10 @@ if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then NEED_XMLTO="$NEED_XMLTO libXfont" fi +if [[ -n $ADK_PACKAGE_PACEMAKER_MGMTD ]]; then + NEED_SWIG="$NEED_SWIG pacemaker-mgmtd" +fi + if [[ -n $ADK_PACKAGE_EGLIBC ]]; then NEED_GPERF="$NEED_GPERF eglibc" fi @@ -313,6 +317,13 @@ if [[ -n $NEED_LIBIDL ]]; then fi fi +if [[ -n $NEED_SWIG ]]; then + if ! which swig >/dev/null 2>&1; then + echo >&2 You need swig to build $NEED_SWIG + out=1 + fi +fi + if [[ -n $NEED_GPERF ]]; then if ! which gperf >/dev/null 2>&1; then echo >&2 You need gperf to build $NEED_GPERF |