summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2005-01-07 12:03:11 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2005-01-07 12:03:11 +0000
commit8aef4d2af0a39461845381879d19d9473200e1f5 (patch)
tree4fb0ba7bcec30c86dadf263bd2151a7a68e177e6 /net-misc/adjtimex
parent4.1.3-r2 Stable on x86. (diff)
downloadhistorical-8aef4d2af0a39461845381879d19d9473200e1f5.tar.gz
historical-8aef4d2af0a39461845381879d19d9473200e1f5.tar.bz2
historical-8aef4d2af0a39461845381879d19d9473200e1f5.zip
bug #70342, patch by solar for hardened to work right.
Diffstat (limited to 'net-misc/adjtimex')
-rw-r--r--net-misc/adjtimex/ChangeLog8
-rw-r--r--net-misc/adjtimex/Manifest19
-rw-r--r--net-misc/adjtimex/adjtimex-1.16-r1.ebuild5
-rw-r--r--net-misc/adjtimex/adjtimex-1.16.ebuild4
-rw-r--r--net-misc/adjtimex/files/adjtimex-1.16-pic.patch14
5 files changed, 30 insertions, 20 deletions
diff --git a/net-misc/adjtimex/ChangeLog b/net-misc/adjtimex/ChangeLog
index 13bf5952d466..765fc2f1c0b6 100644
--- 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 e88ceedf9256..b38bc957e08b 100644
--- 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 8717a30346c0..5ff089633795 100644
--- 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 2e881f0f09f6..a5331c67b348 100644
--- 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
index 000000000000..320355edd25a
--- /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