diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 09:58:05 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 09:58:05 +0100 |
| commit | 2baedf828edf246b8d0bd530ec9e1481b2009518 (patch) | |
| tree | 436e51037c969a22eb787af6e87c6399a243aedf | |
| parent | 35137e6c091fcb33147ad58d52140659a63affdc (diff) | |
| parent | 76d0c1cfe5eb3d30ef34396796fc52daed6461c0 (diff) | |
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
| -rw-r--r-- | mk/build.mk | 5 | ||||
| -rw-r--r-- | package/cyrus-sasl/Makefile | 7 | ||||
| -rw-r--r-- | package/cyrus-sasl/patches/patch-config_ltconfig | 13 | ||||
| -rw-r--r-- | package/mksh/Makefile | 10 |
4 files changed, 17 insertions, 18 deletions
diff --git a/mk/build.mk b/mk/build.mk index b6de5f992..42d75bbcd 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -310,7 +310,7 @@ all: menuconfig # --------------------------------------------------------------------------- # force entering the subdir, as dependency checking is done there -.PHONY: $(CONFIG)/conf $(CONFIG)/mconf $(CONFIG)/gconf +.PHONY: $(CONFIG)/conf $(CONFIG)/mconf $(CONFIG)/conf: @$(MAKE) -C $(CONFIG) conf @@ -318,9 +318,6 @@ $(CONFIG)/conf: $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) -$(CONFIG)/gconf: - @$(MAKE) -C $(CONFIG) gconf - defconfig: .menu $(CONFIG)/conf @${BASH} ${TOPDIR}/scripts/update-sys @${BASH} ${TOPDIR}/scripts/update-pkg diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index b3e1794b0..9ffae6c92 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cyrus-sasl PKG_VERSION:= 2.1.26 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= a7f4e5e559a0e37b3ffc438c9456e425 PKG_DESCR:= a general purpose authentication library PKG_SECTION:= libs @@ -21,10 +21,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --enable-staticdlopen \ - --enable-plain \ - --enable-anon \ +CONFIGURE_ARGS+= --enable-plain \ --enable-login \ + --disable-anon \ --disable-cram \ --disable-digest \ --disable-scram \ diff --git a/package/cyrus-sasl/patches/patch-config_ltconfig b/package/cyrus-sasl/patches/patch-config_ltconfig index 7112c26e1..1a04b28e0 100644 --- a/package/cyrus-sasl/patches/patch-config_ltconfig +++ b/package/cyrus-sasl/patches/patch-config_ltconfig @@ -1,5 +1,14 @@ ---- cyrus-sasl-2.1.23.orig/config/ltconfig 2003-06-12 02:32:43.000000000 +0200 -+++ cyrus-sasl-2.1.23/config/ltconfig 2011-08-08 10:54:43.509265006 +0200 +--- cyrus-sasl-2.1.26.orig/config/ltconfig 2012-10-12 16:05:48.000000000 +0200 ++++ cyrus-sasl-2.1.26/config/ltconfig 2014-03-07 07:46:01.000000000 +0100 +@@ -2024,7 +2024,7 @@ linux-gnuoldld* | linux-gnuaout* | linux + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + version_type=linux + need_lib_prefix=no + need_version=no @@ -2034,16 +2034,7 @@ linux-gnu*) shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 1c18044f3..159a3efda 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -4,17 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mksh -PKG_VERSION:= 48b +PKG_VERSION:= 49 PKG_RELEASE:= 1 -PKG_MD5SUM:= ab9baa6b5a4de9d0e6a3ce9957c18da0 +PKG_MD5SUM:= e8c205cac72c3dc8540bbc3897421422 PKG_DESCR:= MirBSD Korn Shell PKG_SECTION:= shells PKG_URL:= http://www.mirbsd.org/ PKG_SITES:= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} -PKG_FLAVOURS_MKSH:= FULL -PKGFD_FULL:= Include all features - DISTFILES= ${PKG_NAME}-R${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/${PKG_NAME} @@ -22,10 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),) TARGET_CPPFLAGS+= -DMKSH_SMALL=1 -endif - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual |