diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h | 11 | ||||
| -rw-r--r-- | package/libxml2/Makefile | 1 | ||||
| -rw-r--r-- | package/microperl/Makefile | 2 | ||||
| -rw-r--r-- | package/python2/Makefile | 6 | ||||
| -rw-r--r-- | package/samba/Makefile | 4 | ||||
| -rw-r--r-- | package/samba/patches/patch-client_mount_cifs_c | 19 | ||||
| -rw-r--r-- | package/samba/patches/patch-source3_registry_reg_perfcount_c | 20 |
7 files changed, 19 insertions, 44 deletions
diff --git a/package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h b/package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h new file mode 100644 index 000000000..f329c1ee1 --- /dev/null +++ b/package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h @@ -0,0 +1,11 @@ +--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/libxml/xmlversion.in.h 2010-06-06 14:49:58.000000000 +0200 ++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/libxml/xmlversion.in.h 2011-10-17 03:58:30.336558512 +0200 +@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i + * + * Whether iconv support is available + */ +-#if 1 ++#if 0 + #define LIBXML_ICONV_ENABLED + #endif + diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index cae954797..e9115efbb 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -19,6 +19,7 @@ PKGSD_LIBXML2_DEV:= XML parser headers PKGSC_LIBXML2_DEV:= devel PKGSD_LIBXML2_PYTHON:= XML python bindings PKGSC_LIBXML2_PYTHON:= libs +PKGSB_LIBXML2_PYTHON:= python2 include ${TOPDIR}/mk/package.mk diff --git a/package/microperl/Makefile b/package/microperl/Makefile index 040daa12d..6507939b5 100644 --- a/package/microperl/Makefile +++ b/package/microperl/Makefile @@ -26,7 +26,7 @@ MAKE_FLAGS+= CC="${TARGET_CC}" OPTIMIZE="${TARGET_CFLAGS}" MAKE_FILE:= Makefile.micro pre-configure: - $(CP) ./files/uconfig.h.$(ARCH) $(WRKBUILD)/uconfig.h + $(CP) ./files/uconfig.h.$(CPU_ARCH) $(WRKBUILD)/uconfig.h do-install: ${INSTALL_DIR} ${IDIR_MICROPERL}/usr/bin diff --git a/package/python2/Makefile b/package/python2/Makefile index 2aed3ed49..b28b5d49e 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -30,6 +30,7 @@ $(eval $(call PKG_template,PYTHON2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P $(eval $(call PKG_template,PYTHON2_BZIP2,${PKG_NAME}-bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_BZIP2},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,PYTHON2_READLINE,${PKG_NAME}-readline,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_READLINE},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +TARGET_CFLAGS+= -fPIC MAKE_ENV+= OPT="$(TARGET_CFLAGS)" \ RANLIB="${TARGET_CROSS}ranlib" \ HOSTPYTHON=./hostpython \ @@ -74,10 +75,11 @@ post-install: ${CP} ${WRKINST}/usr/lib/python2.7/* ${IDIR_PYTHON2}/usr/lib/python2.7 ${CP} ${WRKINST}/usr/include/python2.7/* ${IDIR_PYTHON2}/usr/include/python2.7 -find ${IDIR_PYTHON2} -name "\*.pyc" -o -name "*\.pyo" -exec rm {} \; - rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/readline.so - rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/bz2.so + -rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/readline.so + -rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/bz2.so # workaround, copy host python-config to target scripts directory ${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_DIR}/scripts + (cd ${STAGING_DIR}/usr/bin/ && ln -sf $(STAGING_HOST_DIR)/usr/bin/hostpython hostpython) python2-readline-install: ${INSTALL_DIR} ${IDIR_PYTHON2_READLINE}/usr/lib/python2.7/lib-dynload diff --git a/package/samba/Makefile b/package/samba/Makefile index f083e0ac4..0485febc2 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= samba -PKG_VERSION:= 3.5.3 +PKG_VERSION:= 3.6.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7c8d2a34b649380d5df838c3e030dbec +PKG_MD5SUM:= e297e0ea7923c7de8d7c1d8fd0ec0a05 PKG_DESCR:= NetBIOS/SMB file and print server PKG_SECTION:= net/fs PKG_BUILDDEP:= gettext diff --git a/package/samba/patches/patch-client_mount_cifs_c b/package/samba/patches/patch-client_mount_cifs_c deleted file mode 100644 index 4ddd91f9c..000000000 --- a/package/samba/patches/patch-client_mount_cifs_c +++ /dev/null @@ -1,19 +0,0 @@ ---- samba-3.5.3.orig/client/mount.cifs.c 2010-05-17 13:51:23.000000000 +0200 -+++ samba-3.5.3/client/mount.cifs.c 2010-06-11 12:39:34.501613636 +0200 -@@ -39,7 +39,6 @@ - #include <mntent.h> - #include <fcntl.h> - #include <limits.h> --#include <fstab.h> - #include "mount.h" - - #define MOUNT_CIFS_VERSION_MAJOR "1" -@@ -112,7 +111,7 @@ - * The legacy behavior is now disabled by default. To reenable it, set the - * following #define to true. - */ --#define CIFS_LEGACY_SETUID_CHECK 0 -+#define CIFS_LEGACY_SETUID_CHECK 1 - - /* - * When an unprivileged user runs a setuid mount.cifs, we set certain mount diff --git a/package/samba/patches/patch-source3_registry_reg_perfcount_c b/package/samba/patches/patch-source3_registry_reg_perfcount_c deleted file mode 100644 index 684036b5b..000000000 --- a/package/samba/patches/patch-source3_registry_reg_perfcount_c +++ /dev/null @@ -1,20 +0,0 @@ ---- samba-3.5.3.orig/source3/registry/reg_perfcount.c 2010-05-17 13:51:23.000000000 +0200 -+++ samba-3.5.3/source3/registry/reg_perfcount.c 2010-06-11 12:21:42.911613348 +0200 -@@ -618,14 +618,14 @@ static bool _reg_perfcount_add_counter(s - obj = NULL; - memset(buf, 0, PERFCOUNT_MAX_LEN); - memcpy(buf, data.dptr, data.dsize); -- begin = index(buf, '['); -- end = index(buf, ']'); -+ begin = strchr(buf, '['); -+ end = strchr(buf, ']'); - if(begin == NULL || end == NULL) - return False; - start = begin+1; - - while(start < end) { -- stop = index(start, ','); -+ stop = strchr(start, ','); - if(stop == NULL) - stop = end; - *stop = '\0'; |