From c8faacfd346a1956e44f05ee3d48e74ffc1f6521 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 6 Mar 2013 16:52:39 +0100 Subject: varios fixes and updates --- package/asterisk/Makefile | 12 ++++++------ package/libvirt/Makefile | 8 +++++--- package/oprofile/Makefile | 4 ++-- package/squid/Makefile | 42 ++++++++++++++++++++++-------------------- 4 files changed, 35 insertions(+), 31 deletions(-) diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index d3a55ad1f..d9caa7c4f 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 1.8.3 +PKG_VERSION:= 1.8.20.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 79964868c124a921e71fd568fbc9290f +PKG_MD5SUM:= 99204257de80a42c4e287fc93dfe714a PKG_DESCR:= Open Source PBX PKG_SECTION:= phone PKG_DEPENDS:= libncurses libpthread libopenssl libcurl @@ -19,7 +19,7 @@ PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= !cris -PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS ASTERISK_CHAN_MGCP +PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM PKG_SUBPKGS+= ASTERISK_PBX_DUNDI ASTERISK_RES_AGI PKGSB_ASTERISK_CODEC_SPEEX:= speex @@ -37,7 +37,7 @@ $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_ASTERISK_SOUNDS},${PKGSD_ASTERISK_SOUNDS},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_MGCP},${PKG_SECTION})) +#$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_MGCP},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_SKINNY},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_IAX2},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CODEC_SPEEX},${PKG_SECTION})) @@ -117,8 +117,8 @@ pre-build: post-build: cd ${WRKBUILD}/sounds ; \ - tar xzf asterisk-core-sounds-en-gsm-1.4.20.tar.gz ; \ - rm asterisk-core-sounds-en-gsm-1.4.20.tar.gz + tar xzf asterisk-core-sounds-en-gsm-1.4.22.tar.gz ; \ + rm asterisk-core-sounds-en-gsm-1.4.22.tar.gz do-install: $(CP) $(WRKINST)/* $(IDIR_ASTERISK) diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index 392b62638..61e562664 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libvirt -PKG_VERSION:= 0.9.10 +PKG_VERSION:= 1.0.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= a424bb793521e637349da47e93dd5fff +PKG_MD5SUM:= 3d9f85d586c9aa3d819b626622f3fc97 PKG_DESCR:= virtualization API PKG_SECTION:= libs PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted udev @@ -14,7 +14,7 @@ PKG_DEPENDS:= libxml2 libgnutls python2 libpcap libreadline PKG_DEPENDS+= libintl dmidecode kmod-netfilter-xt-target-checksum PKG_DEPENDS+= dnsmasq qemu libnl PKG_URL:= http://www.libvirt.org/ -PKG_SITES:= ftp://libvirt.org/libvirt/ +PKG_SITES:= http://libvirt.org/sources/ PKG_HOST_DEPENDS:= !freebsd !netbsd !openbsd PKG_ARCH_DEPENDS:= x86 x86_64 @@ -26,6 +26,7 @@ $(eval $(call PKG_template,LIBVIRT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P include ${TOPDIR}/mk/python.mk TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/tirpc +TARGET_CFLAGS+= -fno-stack-protector CONFIGURE_ENV+= gl_cv_warn__fstack_protector_all=no \ ac_cv_path_IPTABLES_PATH=/usr/sbin/iptables \ @@ -38,6 +39,7 @@ CONFIGURE_ARGS+= --without-xen \ --without-lxc \ --without-vbox \ --without-macvtap \ + --without-remote \ --disable-silent-rules \ --without-sasl diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 78408fd7c..d0bfbea2d 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= oprofile -PKG_VERSION:= 0.9.7 +PKG_VERSION:= 0.9.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8b5d1d9b65f84420bcc3234777ad3be3 +PKG_MD5SUM:= 6d127023af1dd1cf24e15411229f3cc8 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx diff --git a/package/squid/Makefile b/package/squid/Makefile index f07c0490c..50751442f 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -19,9 +19,9 @@ PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= !avr32 PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA -PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_PASSWORD -PKG_SUBPKGS+= SQUID_MOD_EXTERNAL_ACL_IP_USER SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP -PKG_SUBPKGS+= SQUID_MOD_NTLM_AUTH_FAKEAUTH SQUID_MOD_BASIC_AUTH_LDAP +PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_FILE +PKG_SUBPKGS+= SQUID_MOD_EXTERNAL_ACL_FILE_USERIP SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP +PKG_SUBPKGS+= SQUID_MOD_NTLM_AUTH_FAKE SQUID_MOD_BASIC_AUTH_LDAP PKGSS_SQUID_MOD_BASIC_AUTH_LDAP:= libopenldap PKGSB_SQUID_MOD_BASIC_AUTH_LDAP:= openldap @@ -44,13 +44,13 @@ ifeq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB}${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_ BASIC_AUTH_HELPERS:= none endif -ifneq (${ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD},) -DIGEST_AUTH_HELPERS:= password +ifneq (${ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_FILE},) +DIGEST_AUTH_HELPERS:= file else DIGEST_AUTH_HELPERS:= none endif -ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER},) -EXTERNAL_ACL_HELPERS+= ip_user +ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_FILE_USERIP},) +EXTERNAL_ACL_HELPERS+= file_userip endif ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP},) EXTERNAL_ACL_HELPERS+= unix_group @@ -59,14 +59,16 @@ ifeq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER}${ADK_PACKAGE_SQUID_MOD_EXTER EXTERNAL_ACL_HELPERS:= none endif -ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH},) -NTLM_AUTH_HELPERS+= fakeauth +ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKE},) +NTLM_AUTH_HELPERS+= fake else NTLM_AUTH_HELPERS+= none endif include ${TOPDIR}/mk/package.mk +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 + define PKG_mod_template INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install @@ -82,20 +84,20 @@ $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-a $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_LDAP,${PKG_NAME}-mod-basic-auth-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_FILE,${PKG_NAME}-mod-digest-auth-file,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap)) -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check)) +$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKE,${PKG_NAME}-mod-ntlm-auth-fake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,basic_getpwnam_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,basic_ldap_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,basic_ncsa_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,basic_smb_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_FILE,digest_pw_file)) +$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_FILE_USERIP,file_userip)) $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group)) -$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,ext_unix_group_acl)) +$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,fake_auth)) TARGET_LDFLAGS+= -lpthread CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ -- cgit v1.2.3