From eb283f8f1e8af9715f253208d04ab97aa54ce6a7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 24 Nov 2009 18:33:31 +0100 Subject: update mpd, libvirt, php and openldap - make more features available in mpd - add libmms package - do not call redundant clean on cleantarget --- Makefile | 2 +- TODO | 5 +- package/Config.in | 1 + package/Depends.mk | 23 ++++- package/Makefile | 1 + package/faad2/Makefile | 14 +-- package/libaudiofile/Makefile | 6 +- package/libmms/Config.in | 6 ++ package/libmms/Makefile | 27 ++++++ package/libvirt/Makefile | 4 +- .../libvirt/patches/patch-src_storage_backend_c | 11 --- .../patches/patch-src_storage_storage_backend_c | 11 +++ package/moc/Config.in | 2 +- package/mpd/Config.in | 68 +++++++++++--- package/mpd/Makefile | 101 ++++++++++++++++----- package/mpd/patches/patch-m4_lame_m4 | 20 ++++ package/mpd/patches/patch-src_listen_h | 11 --- package/openldap/Makefile | 10 +- package/php/Makefile | 10 +- package/sipsak/Makefile | 6 +- package/sipsak/patches/patch-acinclude_m4 | 12 --- package/sipsak/patches/patch-configure | 10 +- 22 files changed, 249 insertions(+), 112 deletions(-) create mode 100644 package/libmms/Config.in create mode 100644 package/libmms/Makefile delete mode 100644 package/libvirt/patches/patch-src_storage_backend_c create mode 100644 package/libvirt/patches/patch-src_storage_storage_backend_c create mode 100644 package/mpd/patches/patch-m4_lame_m4 delete mode 100644 package/mpd/patches/patch-src_listen_h delete mode 100644 package/sipsak/patches/patch-acinclude_m4 diff --git a/Makefile b/Makefile index b4e4a9045..6569e92a2 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ cleandir dirclean: .prereq_done @-rm -f make.log .prereq_done cleantarget targetclean: .prereq_done - -@${GMAKE_INV} clean cleantarget + -@${GMAKE_INV} cleantarget @-rm -f make.log distclean cleandist: diff --git a/TODO b/TODO index 85f34c9ea..d2bc511c9 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,5 @@ - busybox update to latest version -- more qemu-targets (ppc/sparc) - rpm package backend -- port htop software -- rescue initramfs image (more archs, generic kernel config ) - - usb boot via stick - fix init scripts pidof? vs. killall - freebsd build - win cygwin build @@ -14,3 +10,4 @@ - network scripts for pppoe - customise mconf help texts to better fit for OpenADK - publish via trac + diff --git a/package/Config.in b/package/Config.in index 1c9255d6e..3822ef243 100644 --- a/package/Config.in +++ b/package/Config.in @@ -434,6 +434,7 @@ source "package/libtool/Config.in" # libltdl source "package/openldap/Config.in.lib" source "package/liblzo/Config.in" source "package/libmad/Config.in" +source "package/libmms/Config.in" source "package/ncurses/Config.in" # libncurses source "package/neon/Config.in" source "package/libnet/Config.in" diff --git a/package/Depends.mk b/package/Depends.mk index 732296f0a..4f830e74b 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -291,12 +291,13 @@ endif mplayer-compile: alsa-lib-compile libmad-compile libvorbis-compile faad2-compile ncurses-compile zlib-compile -mpd-compile: alsa-lib-compile glib-compile curl-compile -ifneq ($(ADK_PACKAGE_MPD_MP3),) +mpd-compile: alsa-lib-compile glib-compile + +ifneq ($(ADK_COMPILE_MPD_WITH_MP3),) mpd-compile: libid3tag-compile libmad-compile endif -ifneq ($(ADK_PACKAGE_MPD_MP4),) -mpd-compile: libfaad2 +ifneq ($(ADK_COMPILE_MPD_WITH_MP4),) +mpd-compile: faad2-compile endif ifneq ($(ADK_COMPILE_MPD_WITH_OGG),) mpd-compile: libvorbis-compile @@ -304,12 +305,24 @@ endif ifneq ($(ADK_COMPILE_MPD_WITH_TREMOR),) mpd-compile: libvorbisidec-compile endif -ifneq ($(ADK_PACKAGE_MPD_FLAC),) +ifneq ($(ADK_COMPILE_MPD_WITH_FLAC),) mpd-compile: flac-compile endif +ifneq ($(ADK_COMPILE_MPD_WITH_WAV),) +mpd-compile: libaudiofile-compile +endif ifneq ($(ADK_COMPILE_MPD_WITH_SHOUT),) mpd-compile: lame-compile endif +ifneq ($(ADK_COMPILE_MPD_WITH_CURL),) +mpd-compile: curl-compile +endif +ifneq ($(ADK_COMPILE_MPD_WITH_MMS),) +mpd-compile: libmms-compile +endif +ifneq ($(ADK_COMPILE_MPD_WITH_FFMPEG),) +mpd-compile: ffmpeg-compile +endif ifneq (${ADK_PACKAGE_NUT_SSL},) nut-compile: openssl-compile diff --git a/package/Makefile b/package/Makefile index 5f2b1530c..89fe35b34 100644 --- a/package/Makefile +++ b/package/Makefile @@ -189,6 +189,7 @@ package-$(ADK_PACKAGE_LIBICONV) += libiconv package-$(ADK_PACKAGE_LIBID3TAG) += libid3tag package-$(ADK_PACKAGE_LIBLZO) += liblzo package-$(ADK_PACKAGE_LIBMAD) += libmad +package-$(ADK_PACKAGE_LIBMMS) += libmms package-$(ADK_PACKAGE_LIBNET) += libnet package-$(ADK_PACKAGE_LIBNFSIDMAP) += libnfsidmap package-$(ADK_PACKAGE_LIBNIDS) += libnids diff --git a/package/faad2/Makefile b/package/faad2/Makefile index 20403e056..5c55d5344 100644 --- a/package/faad2/Makefile +++ b/package/faad2/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= faad2 PKG_VERSION:= 2.7 PKG_RELEASE:= 1 PKG_MD5SUM:= ee1b4d67ea2d76ee52c5621bc6dbf61e -PKG_DESCR:= A mp4 decoding library +PKG_DESCR:= A MP4 decoding library PKG_SECTION:= libs PKG_URL:= http://sourceforge.net/projects/faac/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/} @@ -16,17 +16,11 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-mpeg4ip \ --without-xmms -BUILD_STYLE= auto -INSTALL_STYLE= auto - -#pre-install: -# ${INSTALL_DIR} ${WRKINST}/usr/lib -# ${INSTALL_DIR} ${WRKINST}/usr/include -# ${CP} ${WRKBUILD}/common/mp4ff/libmp4ff.a ${WRKINST}/usr/lib -# ${CP} ${WRKBUILD}/common/mp4ff/mp4ff.h ${WRKINST}/usr/include +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBFAAD2}/usr/lib diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index 36b2becf3..4818887bd 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -16,11 +16,11 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBAUDIOFILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_linux_vers=2 CONFIGURE_ARGS+= --with-build-cc=${HOSTCC} -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBAUDIOFILE}/usr/lib diff --git a/package/libmms/Config.in b/package/libmms/Config.in new file mode 100644 index 000000000..b739632de --- /dev/null +++ b/package/libmms/Config.in @@ -0,0 +1,6 @@ +config ADK_PACKAGE_LIBMMS + prompt "libmms........................... common library for parsing mms:// and mmsh:// type network streams" + tristate + default n + help + http://launchpad.net/libmms/ diff --git a/package/libmms/Makefile b/package/libmms/Makefile new file mode 100644 index 000000000..f9cc90dfb --- /dev/null +++ b/package/libmms/Makefile @@ -0,0 +1,27 @@ +# 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:= libmms +PKG_VERSION:= 0.5 +PKG_RELEASE:= 1 +PKG_MD5SUM:= cf83053ec891f14e73a04c84d9de08ee +PKG_DESCR:= common library for parsing mms:// type network streams +PKG_SECTION:= libs +PKG_URL:= https://launchpad.net/libmms +PKG_SITES:= http://launchpad.net/libmms/trunk/0.5/+download/ + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,LIBMMS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_LIBMMS}/usr/lib + ${CP} ${WRKINST}/usr/lib/libmms.so* ${IDIR_LIBMMS}/usr/lib/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index f40800ded..06de43a1f 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libvirt -PKG_VERSION:= 0.7.0 +PKG_VERSION:= 0.7.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8c2c14a7695c9c661004bcfc6468d62d +PKG_MD5SUM:= 1645975662a326969d2f42d5c04574aa PKG_DESCR:= virtualization API PKG_SECTION:= utils PKG_DEPENDS:= libxml2 libgnutls python diff --git a/package/libvirt/patches/patch-src_storage_backend_c b/package/libvirt/patches/patch-src_storage_backend_c deleted file mode 100644 index d47a4493d..000000000 --- a/package/libvirt/patches/patch-src_storage_backend_c +++ /dev/null @@ -1,11 +0,0 @@ ---- libvirt-0.7.0.orig/src/storage_backend.c 2009-08-05 14:50:01.000000000 +0200 -+++ libvirt-0.7.0/src/storage_backend.c 2009-09-11 13:23:38.000000000 +0200 -@@ -128,7 +128,7 @@ virStorageBackendCopyToFD(virConnectPtr - } - } - -- bzero(&zerobuf, sizeof(zerobuf)); -+ memset(&zerobuf, 0, sizeof(zerobuf)); - - if (VIR_ALLOC_N(buf, bytes) < 0) { - virReportOOMError(conn); diff --git a/package/libvirt/patches/patch-src_storage_storage_backend_c b/package/libvirt/patches/patch-src_storage_storage_backend_c new file mode 100644 index 000000000..bab29e4bb --- /dev/null +++ b/package/libvirt/patches/patch-src_storage_storage_backend_c @@ -0,0 +1,11 @@ +--- libvirt-0.7.4.orig/src/storage/storage_backend.c 2009-11-10 14:32:15.000000000 +0100 ++++ libvirt-0.7.4/src/storage/storage_backend.c 2009-11-23 22:51:40.000000000 +0100 +@@ -136,7 +136,7 @@ virStorageBackendCopyToFD(virConnectPtr + goto cleanup; + } + +- bzero(&zerobuf, sizeof(zerobuf)); ++ memset(&zerobuf, 0, sizeof(zerobuf)); + + if (VIR_ALLOC_N(buf, bytes) < 0) { + virReportOOMError(conn); diff --git a/package/moc/Config.in b/package/moc/Config.in index 958ba69a5..823cac68d 100644 --- a/package/moc/Config.in +++ b/package/moc/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_MOC - tristate "moc................................ console audio player" + tristate "moc............................... console audio player" default n select ADK_PACKAGE_LIBVORBIS select ADK_PACKAGE_LIBMAD diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 89a98f24e..aaf317a91 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,19 +1,36 @@ -#menu "mpd............................... Music Player Daemon" +menu "mpd............................... Music Player Daemon" config ADK_PACKAGE_MPD prompt "mpd............................... Music Player Daemon" tristate default n - select ADK_PACKAGE_ALSA_LIB select ADK_PACKAGE_GLIB - select ADK_PACKAGE_LIBCURL help MPD is a music player supporting flac, mp3 and ogg files. It is typically controlled over a network using one of it's many clients including mpc(console), gmpc(gnome), phpmp(php) etc. - http://www.musicpd.org/ +config ADK_COMPILE_MPD_WITH_ALSA + prompt "ALSA playback support" + bool + default y + depends on ADK_PACKAGE_MPD + select ADK_PACKAGE_ALSA_LIB + help + Enable ALSA playback support. + +config ADK_COMPILE_MPD_WITH_SHOUT + prompt "Shoutcast playback support" + bool + default y + depends on ADK_PACKAGE_MPD + select ADK_PACKAGE_LIBSHOUT + select ADK_PACKAGE_LIBVORBISENC + select ADK_PACKAGE_LIBLAME + help + Enable shout support (libshout). + config ADK_COMPILE_MPD_WITH_MP3 prompt "MP3 support" bool @@ -35,7 +52,7 @@ config ADK_COMPILE_MPD_WITH_MP4 config ADK_COMPILE_MPD_OGG prompt "Ogg/Vorbis Support" - tristate + bool depends on ADK_PACKAGE_MPD select ADK_COMPILE_MPD_WITH_OGG if ADK_COMPILE_MPD_OGG_FLOAT select ADK_COMPILE_MPD_WITH_TREMOR if ADK_COMPILE_MPD_OGG_FIXED @@ -81,16 +98,41 @@ config ADK_COMPILE_MPD_WITH_FLAC help Enable flac support (libflac). -config ADK_COMPILE_MPD_WITH_SHOUT - prompt "Shout Support (Streaming support)" +config ADK_COMPILE_MPD_WITH_WAV + prompt "WAVE/AU Support" bool default y depends on ADK_PACKAGE_MPD - depends on ADK_COMPILE_MPD_WITH_OGG - select ADK_PACKAGE_LIBSHOUT - select ADK_PACKAGE_LIBVORBISENC - select ADK_PACKAGE_LIBLAME + select ADK_PACKAGE_LIBAUDIOFILE help - Enable shout support (libshout). + Enable wave support (libaudiofile). + +config ADK_COMPILE_MPD_WITH_CURL + prompt "HTTP streaming support" + bool + default y + depends on ADK_PACKAGE_MPD + select ADK_PACKAGE_LIBCURL + help + Enable http streaming support (libcurl). + +config ADK_COMPILE_MPD_WITH_MMS + prompt "MMS streaming support" + bool + default n + depends on ADK_PACKAGE_MPD + select ADK_PACKAGE_LIBMMS + help + Enable mms streaming support (libmms). + +config ADK_COMPILE_MPD_WITH_FFMPEG + prompt "FFMPEG support" + bool + default n + depends on ADK_PACKAGE_MPD + select ADK_PACKAGE_FFMPEG + help + Enable FFMPEG support (ffmpeg). + -#endmenu +endmenu diff --git a/package/mpd/Makefile b/package/mpd/Makefile index b45a96976..e0da5805d 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -4,17 +4,21 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd -PKG_VERSION:= 0.14.2 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 64177135f64aca555887ba378de8cdfb -PKG_DESCR:= A music player for flac, mp3 and ogg +PKG_VERSION:= 0.15.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c78b8933e4902c5dc407d59925f8b10e +PKG_DESCR:= A music player daemon PKG_SECTION:= net -PKG_DEPENDS:= alsa-lib glib libcurl +PKG_DEPENDS:= glib PKG_URL:= http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/} include ${TOPDIR}/mk/package.mk +ifneq (${ADK_COMPILE_MPD_WITH_ALSA},) +PKG_DEPENDS+= alsa-lib +endif + ifneq (${ADK_COMPILE_MPD_WITH_MP3},) PKG_DEPENDS+= libid3tag libmad endif @@ -23,7 +27,7 @@ ifneq (${ADK_COMPILE_MPD_WITH_MP4},) PKG_DEPENDS+= libfaad2 endif -ifeq (${ADK_COMPILE_MPD_WITH_OGG},y) +ifneq (${ADK_COMPILE_MPD_WITH_OGG},) PKG_DEPENDS+= libvorbis libogg endif @@ -35,29 +39,56 @@ ifneq (${ADK_COMPILE_MPD_WITH_FLAC},) PKG_DEPENDS+= libflac endif +ifneq (${ADK_COMPILE_MPD_WITH_WAV},) +PKG_DEPENDS+= libaudiofile +endif + ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},) PKG_DEPENDS+= libshout liblame endif +ifneq (${ADK_COMPILE_MPD_WITH_CURL},) +PKG_DEPENDS+= libcurl +endif + +ifneq (${ADK_COMPILE_MPD_WITH_MMS},) +PKG_DEPENDS+= libmms +endif + +ifneq (${ADK_COMPILE_MPD_WITH_FFMPEG},) +PKG_DEPENDS+= ffmpeg +endif + $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu +CONFIGURE_STYLE:= gnu autotool BUILD_STYLE:= auto INSTALL_STYLE:= auto XAKE_FLAGS+= MPD_CFLAGS='-D_GNU_SOURCE' CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ARGS+= \ - --enable-alsa \ - --disable-mod \ + --disable-httpd-output \ + --disable-ao \ + --disable-jack \ + --disable-fifo \ + --disable-pulse \ --disable-oss \ - --disable-audiofile \ --disable-mpc \ + --disable-wavpack \ + --disable-sqlite \ + --with-zeroconf=no + +ifneq (${ADK_COMPILE_MPD_WITH_ALSA},) +CONFIGURE_ARGS+= --enable-alsa +else +CONFIGURE_ARGS+= --disable-alsa +endif ifneq (${ADK_COMPILE_MPD_WITH_MP3},) -CONFIGURE_ARGS+= --enable-id3 --enable-mp3 +CONFIGURE_ARGS+= --enable-id3 --enable-mad else -CONFIGURE_ARGS+= --disable-id3 --disable-mp3 +CONFIGURE_ARGS+= --disable-id3 --disable-mad endif ifneq (${ADK_COMPILE_MPD_WITH_MP4},) @@ -66,15 +97,15 @@ else CONFIGURE_ARGS+= --disable-aac endif -ifeq (${ADK_COMPILE_MPD_WITH_OGG},y) -CONFIGURE_ARGS+= --enable-oggvorbis +ifneq (${ADK_COMPILE_MPD_WITH_OGG},) +CONFIGURE_ARGS+= --enable-vorbis else -CONFIGURE_ARGS+= --disable-oggvorbis +CONFIGURE_ARGS+= --disable-vorbis endif ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},) CONFIGURE_ARGS+= \ - --disable-oggvorbis \ + --disable-vorbis \ --with-tremor \ --with-tremor-includes=${STAGING_DIR}/usr/include \ --with-tremor-libraries=${STAGING_DIR}/usr/lib @@ -86,14 +117,40 @@ else CONFIGURE_ARGS+= --disable-flac endif +ifneq (${ADK_COMPILE_MPD_WITH_WAV},) +CONFIGURE_ARGS+= --enable-audiofile +else +CONFIGURE_ARGS+= --disable-audiofile +endif + ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},) -CONFIGURE_ARGS+= --enable-shout-ogg \ - --enable-shout-mp3 \ - --enable-lame +CONFIGURE_ARGS+= --enable-shout \ + --enable-lame-encoder \ + --enable-vorbis-encoder \ + --with-lame-includes=${STAGING_DIR}/usr/include \ + --with-lame-libraries=${STAGING_DIR}/usr/lib +else +CONFIGURE_ARGS+= --disable-shout \ + --disable-lame-encoder \ + --disable-vorbis-encoder +endif + +ifneq (${ADK_COMPILE_MPD_WITH_CURL},) +CONFIGURE_ARGS+= --enable-curl +else +CONFIGURE_ARGS+= --disable-curl +endif + +ifneq (${ADK_COMPILE_MPD_WITH_MMS},) +CONFIGURE_ARGS+= --enable-mms +else +CONFIGURE_ARGS+= --disable-mms +endif + +ifneq (${ADK_COMPILE_MPD_WITH_FFMPEG},) +CONFIGURE_ARGS+= --enable-ffmpeg else -CONFIGURE_ARGS+= --disable-shout-ogg \ - --disable-shout-mp3 \ - --disable-lame +CONFIGURE_ARGS+= --disable-ffmpeg endif post-install: diff --git a/package/mpd/patches/patch-m4_lame_m4 b/package/mpd/patches/patch-m4_lame_m4 new file mode 100644 index 000000000..b2f009293 --- /dev/null +++ b/package/mpd/patches/patch-m4_lame_m4 @@ -0,0 +1,20 @@ +--- mpd-0.15.6.orig/m4/lame.m4 2009-11-19 03:47:51.000000000 +0100 ++++ mpd-0.15.6/m4/lame.m4 2009-11-23 23:06:27.000000000 +0100 +@@ -25,8 +25,6 @@ if test "x$lame_prefix" != "xno" ; then + LAME_LIBS="-L$lame_libraries" + elif test "x$lame_prefix" != "x" ; then + LAME_LIBS="-L$lame_prefix/lib" +- elif test "x$prefix" != "xNONE" ; then +- LAME_LIBS="-L$prefix/lib" + fi + + LAME_LIBS="$LAME_LIBS -lmp3lame -lm" +@@ -35,8 +33,6 @@ if test "x$lame_prefix" != "xno" ; then + LAME_CFLAGS="-I$lame_includes" + elif test "x$lame_prefix" != "x" ; then + LAME_CFLAGS="-I$lame_prefix/include" +- elif test "x$prefix" != "xNONE"; then +- LAME_CFLAGS="-I$prefix/include" + fi + + AC_MSG_CHECKING(for liblame) diff --git a/package/mpd/patches/patch-src_listen_h b/package/mpd/patches/patch-src_listen_h deleted file mode 100644 index e14baa2bb..000000000 --- a/package/mpd/patches/patch-src_listen_h +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- mpd-0.14.2.orig/src/listen.h 2009-02-13 17:12:00.000000000 +0100 -+++ mpd-0.14.2/src/listen.h 2009-05-29 00:49:32.000000000 +0200 -@@ -20,6 +20,7 @@ - #define MPD_LISTEN_H - - #include -+#include - - extern int boundPort; - diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 988dc61ca..c2d01b253 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openldap -PKG_VERSION:= 2.4.16 +PKG_VERSION:= 2.4.19 PKG_RELEASE:= 1 -PKG_MD5SUM:= ed5b86e9d2b372d10edfe3bb59fee165 +PKG_MD5SUM:= 4a6dab2711fcf141f19bb680bc335887 PKG_DESCR:= OpenLDAP client libraries PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsasl2 @@ -65,11 +65,11 @@ pre-configure: ${MAKE} -C ${WRKBUILD}/libraries/liblutil clean ${MAKE} -C ${WRKBUILD}/libraries/liblunicode clean -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTIONS} -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto XAKE_FLAGS+= STRIP="" CPPFLAGS="-D_GNU_SOURCE" post-install: diff --git a/package/php/Makefile b/package/php/Makefile index 6f3e8aa86..9a479fb5d 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,23 +4,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 5.3.0 +PKG_VERSION:= 5.3.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= f4905eca4497da3f0beb5c96863196b4 -PKG_DESCR:= PHP cli +PKG_MD5SUM:= 41fbb368d86acb13fc3519657d277681 +PKG_DESCR:= PHP CLI PKG_SECTION:= net PKG_DEPENDS:= libopenssl zlib PHP_URL:= http://www.php.net PKG_SITES:= http://de.php.net/distributions/ -PKG_DESCR_1:= PHP for FastCGI usage +PKG_DESCR_FCGI:= PHP for FastCGI usage # FIX PKG_DEPENDS include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_FCGI},${PKG_SECTION})) define PKG_mod_template diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 089cb6afe..45ba006c9 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= sipsak PKG_VERSION:= 0.9.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c4eb8e282902e75f4f040f09ea9d99d5 -PKG_DESCR:= a SIP (Session Initiation Protocol) stress and diagnostics utility +PKG_DESCR:= a SIP stress and diagnostics utility PKG_SECTION:= net PKG_DEPENDS:= libopenssl PKG_URL:= http://sipsak.org @@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SIPSAK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= autoconf gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-gnutls BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/sipsak/patches/patch-acinclude_m4 b/package/sipsak/patches/patch-acinclude_m4 deleted file mode 100644 index fb642f9a4..000000000 --- a/package/sipsak/patches/patch-acinclude_m4 +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sipsak-0.9.6.orig/acinclude.m4 2006-01-28 22:11:34.000000000 +0100 -+++ sipsak-0.9.6/acinclude.m4 2009-05-31 16:36:57.000000000 +0200 -@@ -363,7 +363,7 @@ AC_DEFUN([SIPSAK_GCC_STACK_PROTECT_CC],[ - AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector]) - ssp_old_cflags="$CFLAGS" - CFLAGS="$CFLAGS -fstack-protector" -- AC_TRY_COMPILE(,,, ssp_cc=no) -+ AC_TRY_LINK(,,, ssp_cc=no) - echo $ssp_cc - if test "X$ssp_cc" = "Xno"; then - CFLAGS="$ssp_old_cflags" diff --git a/package/sipsak/patches/patch-configure b/package/sipsak/patches/patch-configure index 40399b86b..877251f30 100644 --- a/package/sipsak/patches/patch-configure +++ b/package/sipsak/patches/patch-configure @@ -1,6 +1,5 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- sipsak-0.9.6.orig/configure 2006-01-28 22:11:34.000000000 +0100 -+++ sipsak-0.9.6/configure 2009-05-31 16:35:17.000000000 +0200 ++++ sipsak-0.9.6/configure 2009-11-23 20:57:18.000000000 +0100 @@ -1,27 +1,56 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -3223,7 +3222,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -2902,8 +3347,8 @@ fi +@@ -2902,10 +3347,10 @@ fi ssp_cc=yes if test "X$CC" != "X"; then @@ -3232,8 +3231,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ + { echo "$as_me:$LINENO: checking whether ${CC} accepts -fstack-protector" >&5 +echo $ECHO_N "checking whether ${CC} accepts -fstack-protector... $ECHO_C" >&6; } ssp_old_cflags="$CFLAGS" - CFLAGS="$CFLAGS -fstack-protector" +- CFLAGS="$CFLAGS -fstack-protector" ++ CFLAGS="$CFLAGS" cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF @@ -2922,35 +3367,31 @@ main () } _ACEOF -- cgit v1.2.3