Fix for _syscall usage, bug #162525.

Package-Manager: portage-2.1.2.1-r1

5 files changed, 92 insertions, 5 deletions

diff --git a/net-misc/adjtimex/ChangeLog b/net-misc/adjtimex/ChangeLog
index 3b4ee5958593..d88cd9b13ae9 100644
--- a/net-misc/adjtimex/ChangeLog
+++ b/net-misc/adjtimex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/adjtimex
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.14 2007/02/22 02:00:14 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.15 2007/03/07 20:01:25 robbat2 Exp $
+
+*adjtimex-1.20-r2 (07 Mar 2007)
+
+  07 Mar 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/adjtimex-1.20-fix-syscall.patch, +adjtimex-1.20-r2.ebuild:
+  Fix for _syscall usage, bug #162525.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index a02ed42fb4d0..061ea7171314 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -2,6 +2,10 @@ AUX adjtimex-1.16-pic.patch 315 RMD160 f1554dc83ff26b3c667a2a71e13b17d30485f019
 MD5 a7a3b52817fb5f425852e1cbc523b485 files/adjtimex-1.16-pic.patch 315
 RMD160 f1554dc83ff26b3c667a2a71e13b17d30485f019 files/adjtimex-1.16-pic.patch 315
 SHA256 1dd729984de9852e3a2ac6f7a525cfb4a1c101c07b736fbf8e3a8ffa8d5c793c files/adjtimex-1.16-pic.patch 315
+AUX adjtimex-1.20-fix-syscall.patch 404 RMD160 1d43ea4b75ed71e921399c9ad9a3e5e117098249 SHA1 e6a0025619a4494ec87c0cfe535c6abd20784aa0 SHA256 87911a16bd1762a914157f1637294753407b171e132948798ebb5f8a8b7792c0
+MD5 8395b9cc324afef7c1bca38c99f33b17 files/adjtimex-1.20-fix-syscall.patch 404
+RMD160 1d43ea4b75ed71e921399c9ad9a3e5e117098249 files/adjtimex-1.20-fix-syscall.patch 404
+SHA256 87911a16bd1762a914157f1637294753407b171e132948798ebb5f8a8b7792c0 files/adjtimex-1.20-fix-syscall.patch 404
 AUX adjtimex-1.20-gentoo-utc.patch 820 RMD160 be3e47073c19ece3a497cc0619842ceda2d5ad79 SHA1 d6a1092cd649fd66d0ca70ab240b543a1455b0a5 SHA256 eb9ab65184e5e7d450968651f76169321b841e1e95bef9211a575b9c5978df2d
 MD5 1fb28900109030b90537a9bc71e5a849 files/adjtimex-1.20-gentoo-utc.patch 820
 RMD160 be3e47073c19ece3a497cc0619842ceda2d5ad79 files/adjtimex-1.20-gentoo-utc.patch 820
@@ -27,14 +31,18 @@ EBUILD adjtimex-1.20-r1.ebuild 1479 RMD160 c308595e7abbce7e7c4a696e1b276c6bce41d
 MD5 de17e3469d22e4c7939cf7ca9253e041 adjtimex-1.20-r1.ebuild 1479
 RMD160 c308595e7abbce7e7c4a696e1b276c6bce41d7d4 adjtimex-1.20-r1.ebuild 1479
 SHA256 a842a0ec2d9625425e9888b0ab90f1209be85b7284eaee16a3973fa3ff4973dc adjtimex-1.20-r1.ebuild 1479
+EBUILD adjtimex-1.20-r2.ebuild 1528 RMD160 24e5b2284492551dbd6618207cd38f7130f9cfdd SHA1 c5599abc194269a81d9472943c57042ec4b913ea SHA256 93feedbbe31cc23cb9f1a7fc46ea45417237b3e9f700cac97453ba83b945ec52
+MD5 0ff16fb09b699ddec66559c1da46c7fe adjtimex-1.20-r2.ebuild 1528
+RMD160 24e5b2284492551dbd6618207cd38f7130f9cfdd adjtimex-1.20-r2.ebuild 1528
+SHA256 93feedbbe31cc23cb9f1a7fc46ea45417237b3e9f700cac97453ba83b945ec52 adjtimex-1.20-r2.ebuild 1528
 EBUILD adjtimex-1.20.ebuild 1408 RMD160 79fb26f036b7f150983b37cb4f5867e2719b7821 SHA1 4e6943369e48b572d460f1afe07e50bb57d1fe41 SHA256 5be2a47eeb064b7d0068119afb2b6a2729197c8e301bf917d612832281fc794f
 MD5 b081642c0c04753b6eb6d26a01a14fdb adjtimex-1.20.ebuild 1408
 RMD160 79fb26f036b7f150983b37cb4f5867e2719b7821 adjtimex-1.20.ebuild 1408
 SHA256 5be2a47eeb064b7d0068119afb2b6a2729197c8e301bf917d612832281fc794f adjtimex-1.20.ebuild 1408
-MISC ChangeLog 1872 RMD160 b0abe57b000a56486130eea5552e421ed0278a69 SHA1 f6978d0c7d9552e895cb7a2b49958d1af3751ecc SHA256 ac32044a02eeac3ef1e7a0c64b88bd9a528231455cc0068a39878f86b4724c44
-MD5 ab23a6abe7596a15801d98a16d5eeb48 ChangeLog 1872
-RMD160 b0abe57b000a56486130eea5552e421ed0278a69 ChangeLog 1872
-SHA256 ac32044a02eeac3ef1e7a0c64b88bd9a528231455cc0068a39878f86b4724c44 ChangeLog 1872
+MISC ChangeLog 2068 RMD160 3f10f93d84494add6b22c8fb7fd26ab0ad9d1538 SHA1 1d9bc59ea8bfbd50e7434ae4aa45999617b015e4 SHA256 f9ced1b555d00d9a76e137c399262c825ef15df69a412d254951d737eb3c1e58
+MD5 81115c5be8f0d7a2aaa1e1aa4453d6c5 ChangeLog 2068
+RMD160 3f10f93d84494add6b22c8fb7fd26ab0ad9d1538 ChangeLog 2068
+SHA256 f9ced1b555d00d9a76e137c399262c825ef15df69a412d254951d737eb3c1e58 ChangeLog 2068
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
@@ -51,3 +59,6 @@ SHA256 116bea44c72cb6a1612da957c5a5bb49816f2d34ac7ffe491c254b0badc4263d files/di
 MD5 b87712920ef805dd94c6eba0b699ad15 files/digest-adjtimex-1.20-r1 500
 RMD160 fd851d539dc14199d1141c5103f6c799f342fa3f files/digest-adjtimex-1.20-r1 500
 SHA256 a0a2b83f14f59be8bd2091e5b1c9d156676643a2082f407a2b27d04861603e4a files/digest-adjtimex-1.20-r1 500
+MD5 b87712920ef805dd94c6eba0b699ad15 files/digest-adjtimex-1.20-r2 500
+RMD160 fd851d539dc14199d1141c5103f6c799f342fa3f files/digest-adjtimex-1.20-r2 500
+SHA256 a0a2b83f14f59be8bd2091e5b1c9d156676643a2082f407a2b27d04861603e4a files/digest-adjtimex-1.20-r2 500
diff --git a/net-misc/adjtimex/adjtimex-1.20-r2.ebuild b/net-misc/adjtimex/adjtimex-1.20-r2.ebuild
new file mode 100644
index 000000000000..8fd26bf4e59d
--- /dev/null
+++ b/net-misc/adjtimex/adjtimex-1.20-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/adjtimex-1.20-r2.ebuild,v 1.1 2007/03/07 20:01:25 robbat2 Exp $
+
+inherit fixheadtails eutils
+
+DEBIAN_PV="6"
+MY_P="${P/-/_}"
+DEBIAN_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
+DEBIAN_PATCH="${MY_P}-${DEBIAN_PV}.diff.gz"
+DEBIAN_SRC="${MY_P}.orig.tar.gz"
+DESCRIPTION="display or set the kernel time variables"
+HOMEPAGE="http://www.ibiblio.org/linsearch/lsms/adjtimex.html"
+SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH}
+	${DEBIAN_URI}/${DEBIAN_SRC}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND} sys-apps/sed"
+
+src_unpack() {
+	unpack ${DEBIAN_SRC}
+	epatch ${DISTDIR}/${DEBIAN_PATCH}
+	cd ${S}
+	for i in debian/adjtimexconfig debian/adjtimexconfig.8 ; do
+		sed -e 's|/etc/default/adjtimex|/etc/conf.d/adjtimex|' \
+			-i.orig ${i}
+		sed -e 's|^/sbin/adjtimex |/usr/sbin/adjtimex |' \
+			-i.orig ${i}
+	done
+	epatch ${FILESDIR}/${PN}-1.20-gentoo-utc.patch
+	ht_fix_file debian/adjtimexconfig
+	sed -e '/CFLAGS = -Wall -t/,/endif/d' -i Makefile.in
+	epatch ${FILESDIR}/${PN}-1.16-pic.patch
+	epatch ${FILESDIR}/${PN}-1.20-fix-syscall.patch
+}
+
+src_install() {
+	dodoc README* ChangeLog
+	doman adjtimex.8 debian/adjtimexconfig.8
+	dosbin adjtimex debian/adjtimexconfig
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/adjtimex.init adjtimex
+}
+
+pkg_postinst() {
+	einfo "Please run adjtimexconfig to create the configuration file"
+}
diff --git a/net-misc/adjtimex/files/adjtimex-1.20-fix-syscall.patch b/net-misc/adjtimex/files/adjtimex-1.20-fix-syscall.patch
new file mode 100644
index 000000000000..c5ac87df40bb
--- /dev/null
+++ b/net-misc/adjtimex/files/adjtimex-1.20-fix-syscall.patch
@@ -0,0 +1,12 @@
+diff -Nuar adjtimex-1.20.orig/adjtimex.c adjtimex-1.20/adjtimex.c
+--- adjtimex-1.20.orig/adjtimex.c	2007-03-07 11:57:07.767901000 -0800
++++ adjtimex-1.20/adjtimex.c	2007-03-07 11:57:34.649921951 -0800
+@@ -42,7 +42,7 @@
+ extern int adjtimex(struct timex *);
+ #else
+ #ifndef __PIC__
+-_syscall1(int, adjtimex, struct timex *, txcp)
++#define adjtimex(txcp) syscall(SYS_adjtimex,txcp)
+ #endif
+ #endif
+ #endif
diff --git a/net-misc/adjtimex/files/digest-adjtimex-1.20-r2 b/net-misc/adjtimex/files/digest-adjtimex-1.20-r2
new file mode 100644
index 000000000000..e12ad48a0431
--- /dev/null
+++ b/net-misc/adjtimex/files/digest-adjtimex-1.20-r2
@@ -0,0 +1,6 @@
+MD5 07d6ceeea76e6bda8be82f79f51e64cb adjtimex_1.20-6.diff.gz 41386
+RMD160 4eadc992d525f624007c4ccacdf7b744d09924e5 adjtimex_1.20-6.diff.gz 41386
+SHA256 f405c4126cd6ef42dd1d1c3f21c4827e388b8637737dd2ffe0b000db55050579 adjtimex_1.20-6.diff.gz 41386
+MD5 00b56c266e707b8c753dfe1d33745226 adjtimex_1.20.orig.tar.gz 53923
+RMD160 44f6dd62e9fbf7ee4237d21d79dfd32a7a6c7027 adjtimex_1.20.orig.tar.gz 53923
+SHA256 3ca9119e3497554c0170aba234aa752535f741e383fb35775caab11c088a1415 adjtimex_1.20.orig.tar.gz 53923