fix SEGV thanks to patch supplied by Alexandre Ferreir in bug #195709. also added version bump

Package-Manager: portage-2.1.4.4

5 files changed, 43 insertions, 16 deletions

diff --git a/net-dns/updatedd/ChangeLog b/net-dns/updatedd/ChangeLog
index 413dbc33abdc..8267784e4d0f 100644
--- a/net-dns/updatedd/ChangeLog
+++ b/net-dns/updatedd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/updatedd
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/updatedd/ChangeLog,v 1.8 2007/02/22 02:05:25 peper Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/updatedd/ChangeLog,v 1.9 2008/04/01 10:36:52 dragonheart Exp $
+
+*updatedd-2.6 (01 Apr 2008)
+*updatedd-2.5-r1 (01 Apr 2008)
+
+  01 Apr 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/updatedd-2.6-options.patch, -updatedd-2.3.ebuild,
+  -updatedd-2.4.ebuild, +updatedd-2.5-r1.ebuild, +updatedd-2.6.ebuild:
+  fix SEGV thanks to patch supplied by Alexandre Ferreir in bug #195709. also
+  added version bump
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-dns/updatedd/Manifest b/net-dns/updatedd/Manifest
index 0fd206e0fa52..b27ffe39ca7b 100644
--- a/net-dns/updatedd/Manifest
+++ b/net-dns/updatedd/Manifest
@@ -1,9 +1,9 @@
 AUX updatedd-2.3-makefile.patch 3527 RMD160 c4a43e5ec00947643bd2961fb32acf369f285cbe SHA1 7facf1d0102f35781eaccad14345e6e832940507 SHA256 b267c2a83f2a0cce6dd97c0193e189052edf098efe12a05acb3b77f75089db3d
-DIST updatedd_2.3.tar.gz 360089 RMD160 83adb61d4b5ebd873bfab4707a732d5e6d7e2cc9 SHA1 f4851e4c574d26df876de188f0047dea3eed60b9 SHA256 2af7882c68331d068d562ad7f3bc4c8809b645dabe0d12a5a820ff321056266b
-DIST updatedd_2.4.tar.gz 360054 RMD160 50271bb08469852029d4a76318d5e29dc22a78fd SHA1 9f574777c9d14e4b40007843236c75a1069b1a43 SHA256 152d39fecfdbffe6cd9eac76245203b7c00d0ebbdb7b9ffb314d57487d8e243a
+AUX updatedd-2.6-options.patch 385 RMD160 aa69ea2e2d99bc6d54e1765249d9d235510229cc SHA1 4c389ba05c2d679daf2a1d096a25845f5a44778d SHA256 86c9b58df432cdec5689d0c3255dcd30f60e444fd61771986c512b8ae9f4019c
 DIST updatedd_2.5.tar.gz 364788 RMD160 5b13fa3a0d360fc481a09f0e324b481b22b550a5 SHA1 ae3752892738c7a17864ec62e9b58e0b8e32b5c2 SHA256 d67db9c6b3e03f1a9801e9279a606ff516eba4c8c44d3fe71e923c18a1e5ed09
-EBUILD updatedd-2.3.ebuild 822 RMD160 fca939ba86e080b1d8bf42979ea6c1b3f270d971 SHA1 57bc465d7a518fdc0f8f299dfe0000bebb36b8a1 SHA256 fc7779d8ca3ac48f9d0767e4ae7b0ddad862f14586de24bef5767bc4e7e354e5
-EBUILD updatedd-2.4.ebuild 635 RMD160 fe595f2f1037292f449b2cec61d7e4c6ad4dbdf0 SHA1 094a6a342734e85c6ffee42fd2a432107034814f SHA256 a67bc2b88be5ed17ea5a005dd0f518d8b093dbd85c2e362aa95222493377a88f
+DIST updatedd_2.6.tar.gz 667104 RMD160 c7f8635964a7abe3dd1199120b8ed3a9d476899c SHA1 02a40e70d72c98b339861c41692f9c22fda26716 SHA256 9d240c7e9fcc3f6cb1d32410ca2dee10d359c53f1a5a30d8f3ec49b18b73f1d0
+EBUILD updatedd-2.5-r1.ebuild 742 RMD160 aaf204830be90fa5d95808499af11bcb955279e3 SHA1 53ed99ac86843cb2e29583888b9a5c8e03b9b02c SHA256 6bc7d5f17c1f2350e3a2b742c3f107a279f495b1ceea6a9fbcc76a14f56401f6
 EBUILD updatedd-2.5.ebuild 626 RMD160 abde384caa197da300eca4cb8dc186eb70474ef7 SHA1 a49e5445b24458bcc979072bd6b4e8b4f28240bd SHA256 3acf851474ebdef5e524c4168c1b7d60016e8e898682fe7aedce3266089cafca
-MISC ChangeLog 1222 RMD160 fbd9559414987356c66d6271c11a7e80be1fcf48 SHA1 32e7dbb14c9b8774265904177bb6aaadfab30cfb SHA256 672fec180eedc55c3fdbb8814fc03c52590025b1039139f4112e55b2af236bfe
+EBUILD updatedd-2.6.ebuild 725 RMD160 fabb722e5363edbb5cd54a435115c9642e4767e8 SHA1 ba20c539d7212557c5987a9b1c8cb831a2362728 SHA256 fb66f18615d407b27570643471432cd7c002b9f786e54789564df8ee54dd2be5
+MISC ChangeLog 1571 RMD160 5e6146f395a06800565fa4db345646016e0274e8 SHA1 846b1b77b9fa22b0bf113b4548850bb5579fb1f6 SHA256 bb8b0d9263f5fe937deb489f17953d72d093ea0748571e8937b42aac0e4c8362
 MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
diff --git a/net-dns/updatedd/files/updatedd-2.6-options.patch b/net-dns/updatedd/files/updatedd-2.6-options.patch
new file mode 100644
index 000000000000..17fe89b3e49d
--- /dev/null
+++ b/net-dns/updatedd/files/updatedd-2.6-options.patch
@@ -0,0 +1,12 @@
+--- updatedd-2.6/src/updatedd.c.orig	2008-04-01 19:00:30.000000000 +1100
++++ updatedd-2.6/src/updatedd.c	2008-04-01 19:01:17.000000000 +1100
+@@ -272,7 +272,8 @@
+ 		int c, option_index = 0;
+ 		static struct option long_options[] = {
+ 			{ "help",	0, 0, 'h' },
+-			{ "version",	0, 0, 'v' }
++			{ "version",	0, 0, 'v' },
++			{ 0,    0, 0, 0 }
+ 		};
+ 
+ 		c = getopt_long(argc, argv, "LY",
diff --git a/net-dns/updatedd/updatedd-2.3.ebuild b/net-dns/updatedd/updatedd-2.5-r1.ebuild
index ee09877b4c52..c819fa4a7a54 100644
--- a/net-dns/updatedd/updatedd-2.3.ebuild
+++ b/net-dns/updatedd/updatedd-2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/updatedd/updatedd-2.3.ebuild,v 1.2 2005/01/31 16:06:42 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/updatedd/updatedd-2.5-r1.ebuild,v 1.1 2008/04/01 10:36:52 dragonheart Exp $
 
 inherit eutils
 
@@ -10,16 +10,15 @@ SRC_URI="http://savannah.nongnu.org/download/updatedd/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	# Fix the Makefile.in so $(bindir) is created before installing files there
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile.patch || die "Patch Failed"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.6-options.patch
 }
 
 src_install() {
diff --git a/net-dns/updatedd/updatedd-2.4.ebuild b/net-dns/updatedd/updatedd-2.6.ebuild
index f6a635a3d9ec..f4f6c336b034 100644
--- a/net-dns/updatedd/updatedd-2.4.ebuild
+++ b/net-dns/updatedd/updatedd-2.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/updatedd/updatedd-2.4.ebuild,v 1.1 2005/03/02 08:02:33 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/updatedd/updatedd-2.6.ebuild,v 1.1 2008/04/01 10:36:52 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="Dynamic DNS client with plugins for several dynamic dns services"
 HOMEPAGE="http://updatedd.philipp-benner.de/"
@@ -8,11 +10,16 @@ SRC_URI="http://savannah.nongnu.org/download/updatedd/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="virtual/libc"
 
+src_unpack() {
+	unpack "${A}"
+	epatch "${FILESDIR}"/${P}-options.patch
+}
+
 src_install() {
 	emake DESTDIR=${D} install || die
 	mv ${D}/usr/share/doc/updatedd ${D}/usr/share/doc/${PF}