From 1890a1f7858ebd2fc04a27998c2c3b7df2496921 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Sat, 14 Apr 2007 10:35:54 +0000 Subject: [PATCH] Fix makefile thanks to kingtong in bug 116165 Package-Manager: portage-2.1.2.3 --- net-misc/ser/ChangeLog | 8 +- net-misc/ser/Manifest | 34 ++---- net-misc/ser/files/digest-ser-0.9.0 | 15 --- net-misc/ser/ser-0.9.0.ebuild | 162 ---------------------------- net-misc/ser/ser-0.9.4.ebuild | 9 +- 5 files changed, 21 insertions(+), 207 deletions(-) delete mode 100644 net-misc/ser/files/digest-ser-0.9.0 delete mode 100644 net-misc/ser/ser-0.9.0.ebuild diff --git a/net-misc/ser/ChangeLog b/net-misc/ser/ChangeLog index 9451cc150123..693a66bb1fe1 100644 --- a/net-misc/ser/ChangeLog +++ b/net-misc/ser/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/ser -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.25 2006/12/06 10:43:13 drizzt Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.26 2007/04/14 10:35:54 genstef Exp $ + + 14 Apr 2007; Stefan Schweizer -ser-0.9.0.ebuild, + ser-0.9.4.ebuild: + Fix makefile thanks to kingtong in bug 116165 06 Dec 2006; Timothy Redaelli ser-0.9.6.ebuild: Remove -minline-all-stringops from sparc64, this fix bug #157109. diff --git a/net-misc/ser/Manifest b/net-misc/ser/Manifest index 4b2e03cb3099..4e54fc3f56a5 100644 --- a/net-misc/ser/Manifest +++ b/net-misc/ser/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX ethz-1.0-ser-0.9.0.diff 378 RMD160 6eaf1b30f909bc6385a6d9b1ba03f8e007b668b8 SHA1 5619918bdff96e5e36788c6e8aa21f25ec5c37db SHA256 232a7853be7d7c01170e75472ef671c30963b9651238ca06455233c49b4d04a7 MD5 13df81c549263be3a93c93095cac54c2 files/ethz-1.0-ser-0.9.0.diff 378 RMD160 6eaf1b30f909bc6385a6d9b1ba03f8e007b668b8 files/ethz-1.0-ser-0.9.0.diff 378 @@ -28,43 +25,28 @@ SHA256 61ef9275b08191310956381a48ed163c5a431e57fcd8ee92f9c64f4bfe03427e files/si DIST ethz-1.0-ser-0.9.0.tar.gz 5266 RMD160 fe7bf58ecde23af103f6dba9571e2278d5415406 SHA1 fced2575da4bef39117470e1e4e4cb6b65eeed0f SHA256 0d019caf9e19a51387f95dd511c1930ca8b521a8e9df4fdc042caa8678c371ea DIST ldap-1.0-ser-0.9.0.tar.gz 5069 RMD160 346b50b309f5e172d9cc71a526c6179b414f9825 SHA1 dd21d56b5dadc4ef3a415b69a33c321645fa33d6 SHA256 244817715cf26411820a45c5197346fe4d39407f64b2d05d81bfcf4117ca02b2 DIST ldaps-1.0-ser-0.9.0.tar.gz 5051 RMD160 e31495405b518107a57a34b0e771188a6a1712c7 SHA1 fe06c3fab3c354233c38cbf93edfdc14b309f3d4 SHA256 83e8e54423969dc72a71c71a22c59d4a1e4fe29aa1b886e68acf98d45a8c5126 -DIST ser-0.9.0_src.tar.gz 1853730 RMD160 32ff4a77b4c3182d185422e31ac3026182d016d4 SHA1 e92ed6c3f5029592bd1b8c1fc54152828f1c3456 SHA256 65eb4c5735859f3ed191437749a85e9fd24a66a6567025f36a0739f9c34c444e DIST ser-0.9.4_src.tar.gz 1888783 RMD160 9d2f58ab1ee49b96fb426de00c3ffefb848d4e67 SHA1 e9507fd074fcabd8c47ec932ac898c294cda5342 SHA256 cdfdd2d9b6591feec5d7d6d4ab65d5032b00a08de568a370e02909f8322e8609 DIST ser-0.9.6_src.tar.gz 1846781 RMD160 7aab23c80f1b4bcc65b810a2387978aa104165c1 SHA1 9ce46896abf77f7a29d93012b810cd48e6da898d SHA256 d7870bdbb753deaa335a9ee0aae1852108fe904f74ed4ba903be9d7cd3a0b140 DIST silomail-1.0-ser-0.9.0.tar.gz 4762 RMD160 999d127a3ebad42cb207e2d2519e485588595f9a SHA1 4e07175aabaa153e01e5da16090261fe3ebc5ad1 SHA256 18d60d987246d4b188e8c2b78d721a43e61eb8c50402b19352edada2d2f98826 -EBUILD ser-0.9.0.ebuild 3659 RMD160 1aed5641de7f776db142d7817ded91e55225d4ca SHA1 2941184285875d737655addd40287b3310564f08 SHA256 d6795efdf6f4abb72ed492b3df48f6dced273212be07e759b6626223aada8d6d -MD5 26dd4af0528f57e814e325cc41555874 ser-0.9.0.ebuild 3659 -RMD160 1aed5641de7f776db142d7817ded91e55225d4ca ser-0.9.0.ebuild 3659 -SHA256 d6795efdf6f4abb72ed492b3df48f6dced273212be07e759b6626223aada8d6d ser-0.9.0.ebuild 3659 -EBUILD ser-0.9.4.ebuild 3693 RMD160 bdd622c966a351dcaffa6ddacbd6185d5cef8937 SHA1 05c03022066a7a55747075762ec419f9c5a72080 SHA256 0c89254ddd9712c290b5bd26e240c788871f6a85b44cf60ffc19a2a06523f5ab -MD5 913ac29892a44354adc7a67862929970 ser-0.9.4.ebuild 3693 -RMD160 bdd622c966a351dcaffa6ddacbd6185d5cef8937 ser-0.9.4.ebuild 3693 -SHA256 0c89254ddd9712c290b5bd26e240c788871f6a85b44cf60ffc19a2a06523f5ab ser-0.9.4.ebuild 3693 +EBUILD ser-0.9.4.ebuild 3820 RMD160 f99ab7e173a769a3ab88ed43616ce7b100e75939 SHA1 1e71d99a5140daefc966db31ff10f8c2ede5f515 SHA256 8627b1292941c24350bf41789c285b918f0d20032b0d8263b7b353df62ac6350 +MD5 e16b6b4ecdfcd2b771032c2b97b0fd1f ser-0.9.4.ebuild 3820 +RMD160 f99ab7e173a769a3ab88ed43616ce7b100e75939 ser-0.9.4.ebuild 3820 +SHA256 8627b1292941c24350bf41789c285b918f0d20032b0d8263b7b353df62ac6350 ser-0.9.4.ebuild 3820 EBUILD ser-0.9.6.ebuild 3985 RMD160 92a3a713cb9c01cc34010ab2c0e18813b8c6dc77 SHA1 90bc864476a43b79c77833be77fe3b61e38e756f SHA256 7086dfdd1de6c1c3bca005a8503d11f25a7cde4c964e7f89255a219f69fa88b1 MD5 651505e02061a508c1d7db24487d9edf ser-0.9.6.ebuild 3985 RMD160 92a3a713cb9c01cc34010ab2c0e18813b8c6dc77 ser-0.9.6.ebuild 3985 SHA256 7086dfdd1de6c1c3bca005a8503d11f25a7cde4c964e7f89255a219f69fa88b1 ser-0.9.6.ebuild 3985 -MISC ChangeLog 3951 RMD160 9a5b7b13c23a91092ebf46258791032bdb0ed260 SHA1 718fba42f4d36c7af49409a9455056667db3d873 SHA256 4ee2186d50fbcdc180a35133ce16473b7c9d4d582c9ecbd27f4baeae90f6e6e5 -MD5 8053b30f68a241ff275ec5143bd69b16 ChangeLog 3951 -RMD160 9a5b7b13c23a91092ebf46258791032bdb0ed260 ChangeLog 3951 -SHA256 4ee2186d50fbcdc180a35133ce16473b7c9d4d582c9ecbd27f4baeae90f6e6e5 ChangeLog 3951 +MISC ChangeLog 4093 RMD160 136257295b687a60e71e1456f2db02fb1bfc0373 SHA1 92cf73096e3e6b4fc37ee62cad3c72709b2d0818 SHA256 e4d148b49beaeb514386d8de90528cbec4221db28113c6a3b86850f4394a8a34 +MD5 6df50662e96a63ecf91087bb804b94df ChangeLog 4093 +RMD160 136257295b687a60e71e1456f2db02fb1bfc0373 ChangeLog 4093 +SHA256 e4d148b49beaeb514386d8de90528cbec4221db28113c6a3b86850f4394a8a34 ChangeLog 4093 MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf MD5 b334f14db95c08e71ab02ffd5d712607 metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 metadata.xml 157 SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf metadata.xml 157 -MD5 ef7fbbf276561cfd91df75919e5c78c7 files/digest-ser-0.9.0 1259 -RMD160 33c89ed28c56d9dce6acba03d784beae89baf09a files/digest-ser-0.9.0 1259 -SHA256 ee21bbec2f6e7bea771784241f4f6f95c6bce9619754afa6875f7fad894361e4 files/digest-ser-0.9.0 1259 MD5 a80e12c31d35efc5589684e0ff3c2c96 files/digest-ser-0.9.4 1259 RMD160 fa8e4af1d00d5c3bce47befa77c5633d068360d0 files/digest-ser-0.9.4 1259 SHA256 cd70f983387e638c90752bf6d822be16a00aad3330dba9b5851ec640330ace5a files/digest-ser-0.9.4 1259 MD5 7913dfcc1f55e87fd5718ce1db66f658 files/digest-ser-0.9.6 1259 RMD160 a56cb167badc70351d1f71f7d72939f43e4a51bb files/digest-ser-0.9.6 1259 SHA256 b9d32ea692ab8b7cf3b798bb30bf80c7071dabb33e8cafc583339d7bb928d0cf files/digest-ser-0.9.6 1259 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFdp7LGDyatLGpTbYRApiIAJ9XBUL/bL+mCwOMQpe2em7X5fsnlQCZATnj -69/7I1tyMHvjySnvViOnB3Q= -=team ------END PGP SIGNATURE----- diff --git a/net-misc/ser/files/digest-ser-0.9.0 b/net-misc/ser/files/digest-ser-0.9.0 deleted file mode 100644 index 0ce898721131..000000000000 --- a/net-misc/ser/files/digest-ser-0.9.0 +++ /dev/null @@ -1,15 +0,0 @@ -MD5 72ab86bde9715f4f712c5b6fb8909dd0 ethz-1.0-ser-0.9.0.tar.gz 5266 -RMD160 fe7bf58ecde23af103f6dba9571e2278d5415406 ethz-1.0-ser-0.9.0.tar.gz 5266 -SHA256 0d019caf9e19a51387f95dd511c1930ca8b521a8e9df4fdc042caa8678c371ea ethz-1.0-ser-0.9.0.tar.gz 5266 -MD5 f5741e12d060323eed40f1af978a1310 ldap-1.0-ser-0.9.0.tar.gz 5069 -RMD160 346b50b309f5e172d9cc71a526c6179b414f9825 ldap-1.0-ser-0.9.0.tar.gz 5069 -SHA256 244817715cf26411820a45c5197346fe4d39407f64b2d05d81bfcf4117ca02b2 ldap-1.0-ser-0.9.0.tar.gz 5069 -MD5 b5500e4b2156eed20df1284e85190ae4 ldaps-1.0-ser-0.9.0.tar.gz 5051 -RMD160 e31495405b518107a57a34b0e771188a6a1712c7 ldaps-1.0-ser-0.9.0.tar.gz 5051 -SHA256 83e8e54423969dc72a71c71a22c59d4a1e4fe29aa1b886e68acf98d45a8c5126 ldaps-1.0-ser-0.9.0.tar.gz 5051 -MD5 ae1f9b237f0006785ff22eafa1470ac4 ser-0.9.0_src.tar.gz 1853730 -RMD160 32ff4a77b4c3182d185422e31ac3026182d016d4 ser-0.9.0_src.tar.gz 1853730 -SHA256 65eb4c5735859f3ed191437749a85e9fd24a66a6567025f36a0739f9c34c444e ser-0.9.0_src.tar.gz 1853730 -MD5 4acc4f68df2894da79cbc4d697f22c8f silomail-1.0-ser-0.9.0.tar.gz 4762 -RMD160 999d127a3ebad42cb207e2d2519e485588595f9a silomail-1.0-ser-0.9.0.tar.gz 4762 -SHA256 18d60d987246d4b188e8c2b78d721a43e61eb8c50402b19352edada2d2f98826 silomail-1.0-ser-0.9.0.tar.gz 4762 diff --git a/net-misc/ser/ser-0.9.0.ebuild b/net-misc/ser/ser-0.9.0.ebuild deleted file mode 100644 index 8e5b736e9ded..000000000000 --- a/net-misc/ser/ser-0.9.0.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.0.ebuild,v 1.11 2006/11/23 20:38:59 vivo Exp $ - -inherit eutils flag-o-matic - -IUSE="ipv6 mysql radius postgres jabber ldap ssl" - -ETHZ_PV="1.0" -LDAP_PV="1.0" -LDAPS_PV="1.0" -SILOMAIL_PV="1.0" - -DESCRIPTION="SIP Express Router" -HOMEPAGE="http://www.iptel.org/ser" -SRC_URI="ftp://ftp.berlios.de/pub/ser/${PV}/src/${P}_src.tar.gz - mirror://gentoo/silomail-${SILOMAIL_PV}-${P}.tar.gz - mirror://gentoo/ethz-${ETHZ_PV}-${P}.tar.gz - ldap? ( mirror://gentoo/ldap-${LDAP_PV}-${P}.tar.gz - mirror://gentoo/ldaps-${LDAPS_PV}-${P}.tar.gz )" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~ppc ~sparc x86" - -RDEPEND=" - mysql? ( virtual/mysql ) - radius? ( >=net-dialup/radiusclient-ng-0.5.0 ) - postgres? ( dev-db/postgresql ) - jabber? ( dev-libs/expat ) - ldap? ( - net-nds/openldap - ssl? ( dev-libs/openssl ) - )" - -DEPEND="${RDEPEND} - >=sys-devel/bison-1.35 - >=sys-devel/flex-2.5.4a" - -pkg_setup() { - enewgroup ser - enewuser ser -1 -1 /dev/null ser -} - -src_unpack() { - local modules extmodules MY_A - - # unpack ser source - unpack ${P}_src.tar.gz - - cd ${S} - use ipv6 || \ - sed -i -e "s/-DUSE_IPV6//g" Makefile.defs - - # external modules - extmodules="silomail ethz" - - use mysql && \ - modules="${modules} mysql" - - use radius && \ - modules="${modules} auth_radius group_radius uri_radius avp_radius" - - use jabber && \ - modules="${modules} jabber" - - use postgres && \ - modules="${modules} postgres" - - use ldap && \ - extmodules="${extmodules} ldap" - - use ldap && use ssl && \ - extmodules="${extmodules} ldaps" - - # put list of modules into Makefile, we need the list - # during compile and install phase... - sed -i -e "s:^\(include_modules.*\):\1 ${modules} ${extmodules}:" \ - Makefile - - # fix ser.cfg - sed -i -e "/force_send_socket(smaug:5080);/ d" \ - etc/ser.cfg - - # unpack external modules - # ugly i know... - for x in ${extmodules}; do - MY_A=$(eval echo ${x}-\${$(echo ${x} | tr "[:lower:]" "[:upper:]")_PV}-${P}) - mkdir -p ${S}/modules/${x} - cd ${S}/modules/${x} - unpack ${MY_A}.tar.gz - # fix makefiles - if [[ -f ${FILESDIR}/${MY_A}.diff ]]; then - epatch ${FILESDIR}/${MY_A}.diff - fi - done - - # remove sasl if openldap hasn't been built with it - if use ldap && ! built_with_use net-nds/openldap sasl; then - sed -i -e "s:-lsasl::g" \ - ${S}/modules/ldap/Makefile - - if use ssl; then - sed -i -e "s:-lsasl::g" \ - ${S}/modules/ldaps/Makefile - fi - fi -} - -src_compile() { - # add -fPIC - append-flags -fPIC - - make all \ - CFLAGS="${CFLAGS}" \ - cfg-prefix=/ \ - cfg-target=/etc/ser/ \ - ${myconf} || die -} - -src_install () { - make install \ - prefix="" \ - bin-prefix=${D}/usr/sbin \ - bin-dir="" \ - cfg-prefix=${D}/etc \ - cfg-dir=ser/ \ - cfg-target=/etc/ser/ \ - modules-prefix=${D}/usr/lib/ser \ - modules-dir=modules \ - modules-target=/usr/lib/ser/modules/ \ - man-prefix=${D}/usr/share/man \ - man-dir="" \ - doc-prefix=${D}/usr/share/doc \ - doc-dir=${P} || die - - newinitd ${FILESDIR}/ser.rc6 ser - newconfd ${FILESDIR}/ser.confd ser - exeinto /usr/sbin - newexe scripts/harv_ser.sh harv_ser.sh - newexe scripts/sc serctl - newexe scripts/ser_mysql.sh ser_mysql.sh - - chown -R root:ser ${D}/etc/ser - chmod 750 ${D}/etc/ser - chmod 640 ${D}/etc/ser/* - - # fix manpages - sed -i -e "s:^.B /ser-${PV}AUTHORS:.B /usr/share/doc/${PF}/AUTHORS:" \ - -e "s:^.B /ser:.B /usr/sbin/ser:" \ - ${D}/usr/share/man/*/* -} - -pkg_postinst() { - if has_version ${CATEGORY}/${PN}; then - einfo "Changing permissions on ${ROOT}etc/ser" - - chown -R root:ser ${ROOT}/etc/ser - chmod 750 ${ROOT}/etc/ser - chmod 640 ${ROOT}/etc/ser/* - fi -} diff --git a/net-misc/ser/ser-0.9.4.ebuild b/net-misc/ser/ser-0.9.4.ebuild index 6d092e9c59c1..3948441e9a42 100644 --- a/net-misc/ser/ser-0.9.4.ebuild +++ b/net-misc/ser/ser-0.9.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild,v 1.5 2006/11/23 20:38:59 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild,v 1.6 2007/04/14 10:35:54 genstef Exp $ inherit eutils flag-o-matic @@ -95,6 +95,11 @@ src_unpack() { fi done + if use mysql || use postgres; then + sed -i -e "s:^#DEFS+=-DSQL_ACC$:DEFS+=-DSQL_ACC:" \ + ${S}/modules/acc/Makefile + fi + # remove sasl if openldap hasn't been built with it if use ldap && ! built_with_use net-nds/openldap sasl; then sed -i -e "s:-lsasl::g" \ -- 2.26.2