From a67505baf2fc3c8b590b6886bd425ae15a6aa6d3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Jan 2011 20:55:41 +0100 Subject: add krb5-client subpackage --- package/krb5/Makefile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 0dce661cc..2ed4be6de 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -15,9 +15,12 @@ PKG_URL:= http://web.mit.edu/kerberos/ PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/${PKG_VERSION}/ PKG_NOPARALLEL:= 1 -PKG_SUBPKGS:= KRB5_SERVER LIBKRB5 +PKG_SUBPKGS:= KRB5_SERVER KRB5_CLIENT LIBKRB5 PKGSD_LIBKRB5:= MIT kerberos libraries PKGSC_LIBKRB5:= libs +PKGSD_KRB5_CLIENT:= MIT kerberos client tools +PKGSC_KRB5_CLIENT:= crypto +PKGSS_KRB5_CLIENT:= libkrb5 libncurses libss libcom-err DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-signed.tar WRKSRC= ${WRKDIST}/src @@ -25,6 +28,7 @@ WRKSRC= ${WRKDIST}/src include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KRB5_CLIENT,krb5-client,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_KRB5_CLIENT},${PKGSD_KRB5_CLIENT},${PKGSC_KRB5_CLIENT})) $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5})) TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et @@ -46,11 +50,9 @@ pre-build: # fix nm call in script, we need the GNU version of nm $(SED) "s#@@NM@@#${NM}#" ${WRKSRC}/util/export-check.pl -post-install: - ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc +krb5-server-install: ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin - ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib/krb5/plugins/kdb ${INSTALL_DATA} ./files/kdc.conf ${IDIR_KRB5_SERVER}/etc/krb5kdc ${INSTALL_BIN} ${WRKINST}/usr/bin/{ktutil,kadmin} \ @@ -59,13 +61,18 @@ post-install: ${IDIR_KRB5_SERVER}/usr/sbin ${INSTALL_DATA} ${WRKINST}/usr/lib/krb5/plugins/kdb/db2.so \ ${IDIR_KRB5_SERVER}/usr/lib/krb5/plugins/kdb - ${CP} ${WRKINST}/usr/lib/lib{gssrpc,kadm5clnt*,kadm5srv*,kdb5}.so* \ - ${IDIR_KRB5_SERVER}/usr/lib + +krb5-client-install: + ${INSTALL_DIR} ${IDIR_KRB5_CLIENT}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/{kinit,kpasswd,klist,kdestroy} \ + ${IDIR_KRB5_CLIENT}/usr/bin libkrb5-install: ${INSTALL_DIR} ${IDIR_LIBKRB5}/etc ${INSTALL_DIR} ${IDIR_LIBKRB5}/usr/lib ${INSTALL_DATA} ./files/krb5.conf ${IDIR_LIBKRB5}/etc + ${CP} ${WRKINST}/usr/lib/lib{gssrpc,kadm5clnt*,kadm5srv*,kdb5}.so* \ + ${IDIR_LIBKRB5}/usr/lib ${CP} ${WRKINST}/usr/lib/lib{gssapi_krb5,k5crypto,krb5,krb5support}.so* \ ${IDIR_LIBKRB5}/usr/lib echo '/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init' \ -- cgit v1.2.3 From 1a633fb03f7772fff5b1f9cf12a7baf5ef29aefe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Jan 2011 20:56:18 +0100 Subject: add missing SSP support patches --- package/libid3tag/patches/patch-ltmain_sh | 11 +++++++++++ package/libxcb/patches/patch-ltmain_sh | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 package/libid3tag/patches/patch-ltmain_sh create mode 100644 package/libxcb/patches/patch-ltmain_sh diff --git a/package/libid3tag/patches/patch-ltmain_sh b/package/libid3tag/patches/patch-ltmain_sh new file mode 100644 index 000000000..ce09d8996 --- /dev/null +++ b/package/libid3tag/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libid3tag-0.15.1b.orig/ltmain.sh 2004-02-17 02:52:36.000000000 +0100 ++++ libid3tag-0.15.1b/ltmain.sh 2011-01-30 18:49:04.000000000 +0100 +@@ -1372,7 +1372,7 @@ EOF + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-fstack-protector*|-flto) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/libxcb/patches/patch-ltmain_sh b/package/libxcb/patches/patch-ltmain_sh new file mode 100644 index 000000000..c3b2b8713 --- /dev/null +++ b/package/libxcb/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- libxcb-1.7.orig/ltmain.sh 2010-08-13 13:46:48.000000000 +0200 ++++ libxcb-1.7/ltmain.sh 2011-01-30 18:41:38.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" -- cgit v1.2.3