diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2013-05-15 10:55:28 +0000 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-05-15 10:55:28 +0000 |
commit | f335b1a0e8fb90fb4944ad8a02620721b12b7fdd (patch) | |
tree | e87330a537f5f2a91a9a5e4ed294004e3d01a615 /net-dialup | |
parent | Remove old versions. (diff) | |
download | historical-f335b1a0e8fb90fb4944ad8a02620721b12b7fdd.tar.gz historical-f335b1a0e8fb90fb4944ad8a02620721b12b7fdd.tar.bz2 historical-f335b1a0e8fb90fb4944ad8a02620721b12b7fdd.zip |
Revision bump: Add epatch_user, add patch to prevent sandbox violations, use default 'emake install' instead of einstall, add compatibility with Automake 1.13, wrt bug #469476
Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42
Diffstat (limited to 'net-dialup')
-rw-r--r-- | net-dialup/pptpd/ChangeLog | 10 | ||||
-rw-r--r-- | net-dialup/pptpd/Manifest | 18 | ||||
-rw-r--r-- | net-dialup/pptpd/files/pptpd-1.3.4-sandbox-fix.patch | 21 | ||||
-rw-r--r-- | net-dialup/pptpd/pptpd-1.3.4-r3.ebuild | 79 |
4 files changed, 119 insertions, 9 deletions
diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog index 048a5c4e0d20..754faebf331c 100644 --- a/net-dialup/pptpd/ChangeLog +++ b/net-dialup/pptpd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-dialup/pptpd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.48 2013/03/25 13:23:11 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.49 2013/05/15 10:55:26 pinkbyte Exp $ + +*pptpd-1.3.4-r3 (15 May 2013) + + 15 May 2013; Sergey Popov <pinkbyte@gentoo.org> +pptpd-1.3.4-r3.ebuild, + +files/pptpd-1.3.4-sandbox-fix.patch: + Revision bump: Add epatch_user, add patch to prevent sandbox violations, use + default 'emake install' instead of einstall, add compatibility with Automake + 1.13, wrt bug #469476 25 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> pptpd-1.3.4-r2.ebuild, files/pptpd-1.3.4-gentoo.patch: diff --git a/net-dialup/pptpd/Manifest b/net-dialup/pptpd/Manifest index e4743e34df7d..704af77031a6 100644 --- a/net-dialup/pptpd/Manifest +++ b/net-dialup/pptpd/Manifest @@ -3,20 +3,22 @@ Hash: SHA256 AUX pptpd-1.3.4-gentoo.patch 2150 SHA256 2e333037d30ee567cab87b60fa4cd1cf166ea26e0db0ee98933a76de88ffe6f7 SHA512 9821e8b3a1471d37accd756301c21bcc5acee9059556355ca5e2c2f481d427a898eec77b40299302d0ab1e471a5f3b162143d18b4f0351507cc9048fc874fb64 WHIRLPOOL fb81fe39c74f6bf0caeabdc1d3fe265804d9622fdf6869faff621f85a0bb07c2c25717b6c6573f760002bef70a911b05e015d8f9da207da010d69485a94765ff AUX pptpd-1.3.4-more-reodering-fixes.patch 2340 SHA256 4540048186b1c1805b02d7d4740b89c498ea5e71a313b6592e469087bb4f0e9f SHA512 28fdb770fd286a1b41f77d952dfe0119c2e53e5c4503687fab59141ecfc71609bd8bc31ae747c6ff3303229164bdf9ee88f85ce5d066f84c9913a747d253b407 WHIRLPOOL 027326151984144e19644211e96864b8e87f21dd014673ba82042c01e3806064fa00f29af02253f76e0775748e148c07815d8735b3b88291f03c86e21d50a3d6 +AUX pptpd-1.3.4-sandbox-fix.patch 529 SHA256 213f3e5199d29641a6ae5396386803f63132c71583b2c590df7445fe579a265a SHA512 ea1e2019a09da67cf9c7fd35de97d84b52eb31c3739fadeaef5ebbe37f68a98f37de014eb64e7c553586d85edc06d594d655a3893998a1a55fb4bec287499509 WHIRLPOOL b42f7654b39cb39b1f61004de0be4496abe0180981810cd8080b91f840278ea8ec917c66ecfa5a72a3fb2b3b4d41f57260afd687abe339c873c842fd4795c283 AUX pptpd-confd 131 SHA256 4d69da546e36439dc1a7cb5abb949ad48046155752c047babb5472decdfa1958 SHA512 59f118715cf6c36442687a58f46a54519fb5125383e85c4fa352a4c97f8a4e19f46c9715330550755eb9691e8174b70cdfab48fbd14c2707364e8083d6baa488 WHIRLPOOL a386723e4e0f660563aca44807bf7b2553caf99904a115587072925a49fd2d5cb8c2742cc832afefa16cec4bc85c3c03afc37b149b81c6426474f1f7032bf60e AUX pptpd-init-r2 324 SHA256 10e19019799051cc4129c2cb85ac2576bb3db0fa389bf7da8b9f04a519d970d0 SHA512 a8245b027d4a7c2bc7753fd6693f86073cf6a4f7f7d7a0781fd0ac2f959e2d41f9970c9c4c11d61c4ba434b193a9f986fb8fc40eb1942af15f63741a45799d0d WHIRLPOOL e28c6a9a5f6ebfb87e5b95869a07fde143ab01c1083168e19bd1bc4d5d416aa55ed42944e5859c7a4b4cb41049ac40d8a8c3a0d53ceee11282997caf7e716b4b DIST pptpd-1.3.4.tar.gz 240942 SHA256 c23a9bdd219a0a36ae7ca20e7c9749f2efdcdbf108aabeeeb5066ba442ec88b6 SHA512 382cc7ce9db7f2b6ffe0a075a319267310f736ca1b93e9867e9d5abb3c56edf49d3cf2bba83d6ae778834e0e18a21fddf29444106c8143a3016ca704ac538b1e WHIRLPOOL ae0675c3dad54242ff8d1fd588540ce097eab2dc48af3381fc844db27b0f78059d2abb101cc894464c60fcdbec1ab77c119361a95e866b29a5ae1f15f53f3887 EBUILD pptpd-1.3.4-r2.ebuild 1700 SHA256 47ebb75d81ffd38fc13263b1093d4e3998d4255702467b6d230afce22f2ca54c SHA512 7b3343a27de27ed451a15751349280fd3ccdccb1c9a938061840391082febf10871f8b3558be47134a9ecd41baa4e7efc98cb508394431e10386dbca06c4f8fe WHIRLPOOL 233f7b2a91d069c1bd6239fb47f036d925a97ae46df7c0a3a717c9a68004379065ef68a19a06a015b638f453dda46ae1df437160289477245df2a4be8780c1ac -MISC ChangeLog 7226 SHA256 277983c057c7ca439533bd75c6e40a233954dffe796df9d0811672dbbaef6a46 SHA512 b8f283190a35aa2d6e6225a186614fbf5bb9aa64f6deba36340b428be4313789e75bb5ba78f82538a668a73b6466bb643f28ab4803d13058f126a48320801825 WHIRLPOOL ab144a112a0b08e7f39ddd01dba256459afae0d25f1d7b1147e1e5c9c12e4725fd6c364f0e606e79c20337010d90c47186a18f33e0933b06532a49b041d209e1 +EBUILD pptpd-1.3.4-r3.ebuild 2070 SHA256 afdfc2251736f06abceefd1f219be35a41ac99d1d7188cae66500a00b85bce5e SHA512 d98cdd7cdee6f8140da007d6480f4d64b2b8f9087393bb6ed5682a30042c3d7955eea64cbae43f0ff04774d5b848a93a77023369c028a34685431ce13f2d0243 WHIRLPOOL fcc0c6ebac11e093a23a11c87056f5cea041de18a21c2e298a81921f793f9ba1d7d593fd8a6494b32dc48be0aa4b818c4d1b8748fb9ba0e14d44172a5fad6303 +MISC ChangeLog 7554 SHA256 b03322596debae442e8758705cfd215abdb9439c7e0e3d10942966fd68884aab SHA512 ead311e9f50005844c7f57cb67eb29a527670fe184272bdc15d9453a79e39ed0137657ad4e4174c43f17a008eb5570c855b14f44ce2f12821f9748e61787d6b1 WHIRLPOOL 7f22d6da434e58b6aacd678d106173895c723165a1f5a66b017fc906ab5344f9356cc68c7b61233d8eb98ee459689fdd6a165958c04e725d4638d6f1bdb92555 MISC metadata.xml 306 SHA256 a0cf603b6e5ca038b8b5801dcd69aed9a0a6d0944b36d4cd7653f72a49ca0da2 SHA512 eb93d272f87fc4441a6babbad4d2b681e0dfbba141812000dc1423e6f119b418724bea18e4b5b2de32bbaf3757b19223524f259e113c9a239b55688577169da2 WHIRLPOOL a9680e44c29633c3e4f1c8e01fc3b0e09358d9b75d94c5f0876e60ecedda260c45b0c51b956a3ae7889c3e10ebe53e990aff86ea2ff7da28632404e3435de11f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRUE++AAoJECo/aRed9267Zj4H/jKQpldKMRE+oRglaad48uu/ -8T9KPPRMh02/YwZu1iZr3ASOSXhs1FjuMlDnxJQap206nXT22088+eKoN1xt2+z/ -H9U2DWOBch2x9BWeUYQhyVjlVY/HyValZ5mlwEcUZj0NJYP1vsCucfZMzO71jM/V -e+aJRQAOnF8j8SlcgMoyIIMxisNIyRXgzqQZZVzruaItOSZNAuB86m84dKsCtld5 -jepFSj8neg4bQQ/ucSAHBekqlhUDVkSKemPdZJWic6Lv6+sdyBxM6Voj6SDW6sBy -qqnH1nonF26CxIwLpShPk/Rw22G7vLQhX5YeY5Td7UL6sGe9RQrBw89E3v+suqU= -=RToH +iQEcBAEBCAAGBQJRk2l6AAoJECo/aRed9267bf8H/itq3HTJx9IzS/nZ8qNwsLnY +b+a+SWcpXtsY8oJ1kce0pGDoFuUbZs9uvLpZh4r3IbHsmcBlMtU7x76/ya2Z5uE7 +RtjovpEUrbUGJ2JhigoDFEGN2W82Bleuq5KYnWhm0V0819+M16SvWnZmTzuiTBsj +/ZeObQ3zwQteCqRIP+gaRVCRdni/mEZZbZeEGQYr7ib++Xx/JO08YRzfHw7G0QTt +B3HF4cMZtJ5hD+zsUs5YkwOhJv0QQwoeY8QBLTv0uC7V2L0f3txJ4LQdtoWZdMN1 +N9eUiUiUR8JN9Vyq4C7MKikeK9bu38JnCR5DTk8vkdVg+hEUbe/8XiOimwUysfg= +=UuH6 -----END PGP SIGNATURE----- diff --git a/net-dialup/pptpd/files/pptpd-1.3.4-sandbox-fix.patch b/net-dialup/pptpd/files/pptpd-1.3.4-sandbox-fix.patch new file mode 100644 index 000000000000..de91753f33f5 --- /dev/null +++ b/net-dialup/pptpd/files/pptpd-1.3.4-sandbox-fix.patch @@ -0,0 +1,21 @@ +--- plugins/Makefile.orig 2013-05-15 14:36:33.994231829 +0400 ++++ plugins/Makefile 2013-05-15 14:37:06.686234429 +0400 +@@ -17,14 +17,14 @@ + %.so: %.c + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD) + +-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd ++LIBDIR ?= $(prefix)/lib/pptpd + + install: $(PLUGINS) +- $(INSTALL) -d $(LIBDIR) +- $(INSTALL) $? $(LIBDIR) ++ $(INSTALL) -d $(DESTDIR)$(LIBDIR) ++ $(INSTALL) $? $(DESTDIR)$(LIBDIR) + + uninstall: +- rm -f $(LIBDIR)$(PLUGINS) ++ rm -f $(DESTDIR)$(LIBDIR)$(PLUGINS) + + clean: + rm -f *.o *.so *.a diff --git a/net-dialup/pptpd/pptpd-1.3.4-r3.ebuild b/net-dialup/pptpd/pptpd-1.3.4-r3.ebuild new file mode 100644 index 000000000000..442a38280207 --- /dev/null +++ b/net-dialup/pptpd/pptpd-1.3.4-r3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4-r3.ebuild,v 1.1 2013/05/15 10:55:26 pinkbyte Exp $ + +EAPI="5" + +inherit autotools eutils flag-o-matic + +DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server" +HOMEPAGE="http://poptop.sourceforge.net/" +SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="gre-extreme-debug tcpd" + +DEPEND="net-dialup/ppp:= + tcpd? ( sys-apps/tcp-wrappers )" +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) + +src_prepare() { + epatch "${FILESDIR}/${P}-gentoo.patch" + epatch "${FILESDIR}/${P}-more-reodering-fixes.patch" + epatch "${FILESDIR}/${P}-sandbox-fix.patch" + + # Match pptpd-logwtmp.so's version with pppd's version (#89895) + local PPPD_VER=`best_version net-dialup/ppp` + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" plugins/patchlevel.h || die + + # respect LDFLAGS + sed -i -e "/^LDFLAGS/{s:=:+=:}" plugins/Makefile || die + + # Automake 1.13, compatibility, bug #469476 + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.in || die 'sed on configure.ac failed' + + # remove 'missing' script to prevent warnings + rm missing || die 'remove missing script failed' + + # respect compiler, bug #461722 + tc-export CC + + # Apply user patches + epatch_user + + eautoreconf +} + +src_configure() { + use gre-extreme-debug && append-cppflags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET" + econf \ + --enable-bcrelay \ + $(use tcpd && echo "--with-libwrap") +} + +src_compile() { + emake COPTS="${CFLAGS}" +} + +src_install () { + emake DESTDIR="${D}" install + + insinto /etc + doins samples/pptpd.conf + + insinto /etc/ppp + doins samples/options.pptpd + + newinitd "${FILESDIR}/pptpd-init-r2" pptpd + newconfd "${FILESDIR}/pptpd-confd" pptpd + + dodoc README.* + docinto samples + dodoc samples/* +} |