| 1 |
commit: 2a232f1ede1952b43592ccfba4b4f4e91ffdb9d4 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 9 01:41:02 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 9 01:41:02 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a232f1e |
| 7 |
|
| 8 |
net-proxy/torsocks: remove older stable version 1.2 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
net-proxy/torsocks/files/avoid-pie-static.patch | 67 ------------------------- |
| 13 |
net-proxy/torsocks/files/fix-docdir-r2.patch | 21 -------- |
| 14 |
net-proxy/torsocks/files/fix-find-libc.so.patch | 12 ----- |
| 15 |
net-proxy/torsocks/torsocks-1.2.ebuild | 32 ------------ |
| 16 |
4 files changed, 132 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-proxy/torsocks/files/avoid-pie-static.patch b/net-proxy/torsocks/files/avoid-pie-static.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 7556556..0000000 |
| 21 |
--- a/net-proxy/torsocks/files/avoid-pie-static.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,67 +0,0 @@ |
| 24 |
-We need to avoid tests which have -static and -pie together. |
| 25 |
- |
| 26 |
-See https://bugs.gentoo.org/show_bug.cgi?id=533862 |
| 27 |
- |
| 28 |
-diff -Naur torsocks-2.0.0.orig/configure.ac torsocks-2.0.0/configure.ac |
| 29 |
---- torsocks-2.0.0.orig/configure.ac 2014-08-11 12:44:46.000000000 -0400 |
| 30 |
-+++ torsocks-2.0.0/configure.ac 2015-01-11 12:00:21.174826622 -0500 |
| 31 |
-@@ -144,24 +144,6 @@ |
| 32 |
- # Version information for libtorsocks |
| 33 |
- TORSOCKSLDFLAGS="$LDFLAGS -version-info 1:0:0" |
| 34 |
- |
| 35 |
--# Check for the gcc hardening flags. |
| 36 |
--AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[]) |
| 37 |
--AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[]) |
| 38 |
--AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1], |
| 39 |
-- [CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[]) |
| 40 |
--AX_CHECK_COMPILE_FLAG([-fstack-protector-all], |
| 41 |
-- [CFLAGS="$CFLAGS -fstack-protector-all"],[],[] |
| 42 |
--) |
| 43 |
--AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], |
| 44 |
-- [CFLAGS="$CFLAGS -fno-strict-overflow"],[],[] |
| 45 |
--) |
| 46 |
-- |
| 47 |
--dnl Add hardening linker flags |
| 48 |
--AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[]) |
| 49 |
--AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[]) |
| 50 |
--AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[]) |
| 51 |
--LDFLAGS="$LDFLAGS -D_FORTIFY_SOURCE=2" |
| 52 |
-- |
| 53 |
- dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES |
| 54 |
- dnl instead of LD_PRELOAD |
| 55 |
- case "$host_os" in |
| 56 |
-@@ -255,6 +237,34 @@ |
| 57 |
- DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h" |
| 58 |
- AC_SUBST(DEFAULT_INCLUDES) |
| 59 |
- |
| 60 |
-+############################################################################## |
| 61 |
-+# 9. Test and add hardening flags |
| 62 |
-+############################################################################## |
| 63 |
-+ |
| 64 |
-+# Check for the gcc hardening flags. |
| 65 |
-+AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[]) |
| 66 |
-+AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[]) |
| 67 |
-+AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1], |
| 68 |
-+ [CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[]) |
| 69 |
-+AX_CHECK_COMPILE_FLAG([-fstack-protector-all], |
| 70 |
-+ [CFLAGS="$CFLAGS -fstack-protector-all"],[],[] |
| 71 |
-+) |
| 72 |
-+AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], |
| 73 |
-+ [CFLAGS="$CFLAGS -fno-strict-overflow"],[],[] |
| 74 |
-+) |
| 75 |
-+ |
| 76 |
-+dnl Add hardening linker flags |
| 77 |
-+AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[]) |
| 78 |
-+AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[]) |
| 79 |
-+AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[]) |
| 80 |
-+ |
| 81 |
-+dnl Add glibc hardening |
| 82 |
-+CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" |
| 83 |
-+ |
| 84 |
-+############################################################################## |
| 85 |
-+# 10. Finish up |
| 86 |
-+############################################################################## |
| 87 |
-+ |
| 88 |
- AC_CONFIG_FILES([ |
| 89 |
- Makefile |
| 90 |
- extras/Makefile |
| 91 |
|
| 92 |
diff --git a/net-proxy/torsocks/files/fix-docdir-r2.patch b/net-proxy/torsocks/files/fix-docdir-r2.patch |
| 93 |
deleted file mode 100644 |
| 94 |
index 05986ec..0000000 |
| 95 |
--- a/net-proxy/torsocks/files/fix-docdir-r2.patch |
| 96 |
+++ /dev/null |
| 97 |
@@ -1,21 +0,0 @@ |
| 98 |
-diff -Naur torsocks-2.0.0-rc2.orig/doc/Makefile.am torsocks-2.0.0-rc2/doc/Makefile.am |
| 99 |
---- torsocks-2.0.0-rc2.orig/doc/Makefile.am 2013-09-02 14:06:44.000000000 -0400 |
| 100 |
-+++ torsocks-2.0.0-rc2/doc/Makefile.am 2013-09-17 14:19:37.769272561 -0400 |
| 101 |
-@@ -6,5 +6,5 @@ |
| 102 |
- dist_man5_MANS = torsocks.conf.5 |
| 103 |
- dist_man8_MANS = torsocks.8 |
| 104 |
- |
| 105 |
--dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG |
| 106 |
-+#dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG |
| 107 |
- |
| 108 |
-diff -Naur torsocks-2.0.0-rc2.orig/Makefile.am torsocks-2.0.0-rc2/Makefile.am |
| 109 |
---- torsocks-2.0.0-rc2.orig/Makefile.am 2013-09-02 14:06:44.000000000 -0400 |
| 110 |
-+++ torsocks-2.0.0-rc2/Makefile.am 2013-09-17 14:20:07.945273935 -0400 |
| 111 |
-@@ -2,6 +2,6 @@ |
| 112 |
- |
| 113 |
- SUBDIRS = src doc tests |
| 114 |
- |
| 115 |
--dist_doc_DATA = ChangeLog |
| 116 |
-+#dist_doc_DATA = ChangeLog |
| 117 |
- |
| 118 |
- EXTRA_DIST = gpl-2.0.txt |
| 119 |
|
| 120 |
diff --git a/net-proxy/torsocks/files/fix-find-libc.so.patch b/net-proxy/torsocks/files/fix-find-libc.so.patch |
| 121 |
deleted file mode 100644 |
| 122 |
index 0fb1949..0000000 |
| 123 |
--- a/net-proxy/torsocks/files/fix-find-libc.so.patch |
| 124 |
+++ /dev/null |
| 125 |
@@ -1,12 +0,0 @@ |
| 126 |
-diff -Nuar torsocks-2.0.0-rc3.orig/configure.ac torsocks-2.0.0-rc3/configure.ac |
| 127 |
---- torsocks-2.0.0-rc3.orig/configure.ac 2013-11-03 13:24:51.000000000 -0500 |
| 128 |
-+++ torsocks-2.0.0-rc3/configure.ac 2014-01-26 12:49:55.157606016 -0500 |
| 129 |
-@@ -132,7 +132,7 @@ |
| 130 |
- dnl Get libc full system path. Use prefix or some hardcoded standard |
| 131 |
- dnl location on Unixish system. |
| 132 |
- AC_MSG_CHECKING(location of libc.so) |
| 133 |
--for DIR in "$prefix/lib" "$prefix/usr/lib" '/lib' '/usr/lib'; do |
| 134 |
-+for DIR in "$prefix/lib*" "$prefix/usr/lib*" '/lib*' '/usr/lib*'; do |
| 135 |
- if test "${LIBC_PATH}" = ""; then |
| 136 |
- LIBC_PATH=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1` |
| 137 |
- fi |
| 138 |
|
| 139 |
diff --git a/net-proxy/torsocks/torsocks-1.2.ebuild b/net-proxy/torsocks/torsocks-1.2.ebuild |
| 140 |
deleted file mode 100644 |
| 141 |
index f010fa0..0000000 |
| 142 |
--- a/net-proxy/torsocks/torsocks-1.2.ebuild |
| 143 |
+++ /dev/null |
| 144 |
@@ -1,32 +0,0 @@ |
| 145 |
-# Copyright 1999-2014 Gentoo Foundation |
| 146 |
-# Distributed under the terms of the GNU General Public License v2 |
| 147 |
-# $Id$ |
| 148 |
- |
| 149 |
-EAPI=4 |
| 150 |
- |
| 151 |
-inherit multilib |
| 152 |
- |
| 153 |
-DESCRIPTION="Use most socks-friendly applications with Tor" |
| 154 |
-HOMEPAGE="https://code.google.com/p/torsocks" |
| 155 |
-SRC_URI="https://${PN}.googlecode.com/files/${PN}-1.2.tar.gz" |
| 156 |
- |
| 157 |
-LICENSE="GPL-2" |
| 158 |
-SLOT="0" |
| 159 |
-KEYWORDS="amd64 ~x86" |
| 160 |
-IUSE="static-libs" |
| 161 |
- |
| 162 |
-# We do not depend on tor which might be running on a different box |
| 163 |
-DEPEND="" |
| 164 |
-RDEPEND="${DEPEND}" |
| 165 |
- |
| 166 |
-src_configure() { |
| 167 |
- econf $(use_enable static-libs static) |
| 168 |
-} |
| 169 |
- |
| 170 |
-src_install() { |
| 171 |
- emake DESTDIR="${D}" install |
| 172 |
- |
| 173 |
- #Remove libtool .la files |
| 174 |
- cd "${D}"/usr/$(get_libdir)/torsocks |
| 175 |
- rm -f *.la |
| 176 |
-} |
Archives