bug #70342, patch by solar for hardened to work right.

diff --git a/net-misc/adjtimex/ChangeLog b/net-misc/adjtimex/ChangeLog
index 13bf5952d466c12c10147493d0478a708a66407c..765fc2f1c0b67b9c617eaa4a0405ee2575527612 100644 (file)
--- a/net-misc/adjtimex/ChangeLog
+++ b/net-misc/adjtimex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/adjtimex
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.7 2004/12/05 16:10:47 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.8 2005/01/07 12:03:11 robbat2 Exp $
+
+  07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/adjtimex-1.16-pic.patch:
+  bug #70342, patch by solar for hardened to work right.
 
   05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
   adjtimex-1.16-r1.ebuild:

diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index e88ceedf925667642c23a66b317f890c9b7a9937..b38bc957e08b739ba0314788b671d18c14264944 100644 (file)
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e982d5bf6df09298cd9e4ceca802a164 ChangeLog 928
-MD5 b172b67f03a626e20e24c7032b0c3b14 adjtimex-1.16-r1.ebuild 1362
-MD5 784e240448e6a0f6f72bbc608b27b3a6 adjtimex-1.16.ebuild 1204
+MD5 b4005173a2d5d68d4a04503503663674 adjtimex-1.16.ebuild 1205
+MD5 29a81cf93e8931fa252e34a965042dd1 adjtimex-1.16-r1.ebuild 1404
+MD5 8ad52874fe573701d794a4a4502d87aa ChangeLog 1074
+MD5 f740d2ecd7c08cc4dee2578c3c0c2557 files/digest-adjtimex-1.16-r1 136
 MD5 f740d2ecd7c08cc4dee2578c3c0c2557 files/digest-adjtimex-1.16 136
 MD5 644aa729406bc03a2df4f6dc23da298f files/adjtimex.init 687
-MD5 f740d2ecd7c08cc4dee2578c3c0c2557 files/digest-adjtimex-1.16-r1 136
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBszMTugEuf3OQ0akRAqIpAJsFXsEraaS6I0FB1/1pNkaPFlb9qgCfXsL3
-wCv3klTsoDjXRVSRs8WJ56Q=
-=0XI3
------END PGP SIGNATURE-----
+MD5 a7a3b52817fb5f425852e1cbc523b485 files/adjtimex-1.16-pic.patch 315

diff --git a/net-misc/adjtimex/adjtimex-1.16-r1.ebuild b/net-misc/adjtimex/adjtimex-1.16-r1.ebuild
index 8717a30346c05eeb8158b97786a7085723a3baa4..5ff0896337954d92d496f7f624cfe717b7d20095 100644 (file)
--- a/net-misc/adjtimex/adjtimex-1.16-r1.ebuild
+++ b/net-misc/adjtimex/adjtimex-1.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/adjtimex-1.16-r1.ebuild,v 1.4 2004/12/05 16:10:47 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/adjtimex-1.16-r1.ebuild,v 1.5 2005/01/07 12:03:11 robbat2 Exp $
 
 inherit fixheadtails eutils
 
@@ -32,6 +32,7 @@ src_unpack() {
        done
        ht_fix_file debian/adjtimexconfig
        sed -e '/CFLAGS = -Wall -t/,/endif/d' -i Makefile.in
+       epatch ${FILESDIR}/${PN}-1.16-pic.patch
 }
 
 src_install() {

diff --git a/net-misc/adjtimex/adjtimex-1.16.ebuild b/net-misc/adjtimex/adjtimex-1.16.ebuild
index 2e881f0f09f6eb7e0119c6ddd6aaac0759fe2216..a5331c67b348753eb05efbf65ea935d3bfd57514 100644 (file)
--- a/net-misc/adjtimex/adjtimex-1.16.ebuild
+++ b/net-misc/adjtimex/adjtimex-1.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/adjtimex-1.16.ebuild,v 1.6 2004/09/09 15:27:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/adjtimex-1.16.ebuild,v 1.7 2005/01/07 12:03:11 robbat2 Exp $
 
 inherit fixheadtails eutils
 

diff --git a/net-misc/adjtimex/files/adjtimex-1.16-pic.patch b/net-misc/adjtimex/files/adjtimex-1.16-pic.patch
new file mode 100644 (file)
index 0000000..320355e
--- /dev/null
+++ b/net-misc/adjtimex/files/adjtimex-1.16-pic.patch
@@ -0,0 +1,14 @@
+--- adjtimex.c.orig    2003-08-24 20:10:05.000000000 -0400
++++ adjtimex.c 2004-11-16 09:04:53.000000000 -0500
+@@ -40,9 +40,11 @@
+ #ifdef __ia64__
+ extern int adjtimex(struct timex *);
+ #else
++#ifndef __PIC__
+ _syscall1(int, adjtimex, struct timex *, txcp)
+ #endif
+ #endif
++#endif
+ int F_print = 0;
+ 
+ #ifndef LOG_PATH