net-proxy/torsocks: remove older stable version 1.2

Package-Manager: portage-2.2.20.1
This commit is contained in:
Anthony G. Basile
2015-10-08 21:41:02 -04:00
parent b55e9448f6
commit 2a232f1ede
4 changed files with 0 additions and 132 deletions

View File

@@ -1,67 +0,0 @@
We need to avoid tests which have -static and -pie together.
See https://bugs.gentoo.org/show_bug.cgi?id=533862
diff -Naur torsocks-2.0.0.orig/configure.ac torsocks-2.0.0/configure.ac
--- torsocks-2.0.0.orig/configure.ac 2014-08-11 12:44:46.000000000 -0400
+++ torsocks-2.0.0/configure.ac 2015-01-11 12:00:21.174826622 -0500
@@ -144,24 +144,6 @@
# Version information for libtorsocks
TORSOCKSLDFLAGS="$LDFLAGS -version-info 1:0:0"
-# Check for the gcc hardening flags.
-AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[])
-AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[])
-AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1],
- [CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[])
-AX_CHECK_COMPILE_FLAG([-fstack-protector-all],
- [CFLAGS="$CFLAGS -fstack-protector-all"],[],[]
-)
-AX_CHECK_COMPILE_FLAG([-fno-strict-overflow],
- [CFLAGS="$CFLAGS -fno-strict-overflow"],[],[]
-)
-
-dnl Add hardening linker flags
-AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[])
-AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[])
-AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[])
-LDFLAGS="$LDFLAGS -D_FORTIFY_SOURCE=2"
-
dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES
dnl instead of LD_PRELOAD
case "$host_os" in
@@ -255,6 +237,34 @@
DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h"
AC_SUBST(DEFAULT_INCLUDES)
+##############################################################################
+# 9. Test and add hardening flags
+##############################################################################
+
+# Check for the gcc hardening flags.
+AX_CHECK_COMPILE_FLAG([-fPIE],[CFLAGS="$CFLAGS -fPIE"],[],[])
+AX_CHECK_COMPILE_FLAG([-fwrapv],[CFLAGS="$CFLAGS -fwrapv"],[],[])
+AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1],
+ [CFLAGS="$CFLAGS --param ssp-buffer-size=1"],[],[])
+AX_CHECK_COMPILE_FLAG([-fstack-protector-all],
+ [CFLAGS="$CFLAGS -fstack-protector-all"],[],[]
+)
+AX_CHECK_COMPILE_FLAG([-fno-strict-overflow],
+ [CFLAGS="$CFLAGS -fno-strict-overflow"],[],[]
+)
+
+dnl Add hardening linker flags
+AX_CHECK_LINK_FLAG([-pie],[LDFLAGS="$LDFLAGS -pie"],[],[])
+AX_CHECK_LINK_FLAG([-z relro],[LDFLAGS="$LDFLAGS -z relro"],[],[])
+AX_CHECK_LINK_FLAG([-z now],[LDFLAGS="$LDFLAGS -z now"],[],[])
+
+dnl Add glibc hardening
+CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+
+##############################################################################
+# 10. Finish up
+##############################################################################
+
AC_CONFIG_FILES([
Makefile
extras/Makefile

View File

@@ -1,21 +0,0 @@
diff -Naur torsocks-2.0.0-rc2.orig/doc/Makefile.am torsocks-2.0.0-rc2/doc/Makefile.am
--- torsocks-2.0.0-rc2.orig/doc/Makefile.am 2013-09-02 14:06:44.000000000 -0400
+++ torsocks-2.0.0-rc2/doc/Makefile.am 2013-09-17 14:19:37.769272561 -0400
@@ -6,5 +6,5 @@
dist_man5_MANS = torsocks.conf.5
dist_man8_MANS = torsocks.8
-dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG
+#dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG
diff -Naur torsocks-2.0.0-rc2.orig/Makefile.am torsocks-2.0.0-rc2/Makefile.am
--- torsocks-2.0.0-rc2.orig/Makefile.am 2013-09-02 14:06:44.000000000 -0400
+++ torsocks-2.0.0-rc2/Makefile.am 2013-09-17 14:20:07.945273935 -0400
@@ -2,6 +2,6 @@
SUBDIRS = src doc tests
-dist_doc_DATA = ChangeLog
+#dist_doc_DATA = ChangeLog
EXTRA_DIST = gpl-2.0.txt

View File

@@ -1,12 +0,0 @@
diff -Nuar torsocks-2.0.0-rc3.orig/configure.ac torsocks-2.0.0-rc3/configure.ac
--- torsocks-2.0.0-rc3.orig/configure.ac 2013-11-03 13:24:51.000000000 -0500
+++ torsocks-2.0.0-rc3/configure.ac 2014-01-26 12:49:55.157606016 -0500
@@ -132,7 +132,7 @@
dnl Get libc full system path. Use prefix or some hardcoded standard
dnl location on Unixish system.
AC_MSG_CHECKING(location of libc.so)
-for DIR in "$prefix/lib" "$prefix/usr/lib" '/lib' '/usr/lib'; do
+for DIR in "$prefix/lib*" "$prefix/usr/lib*" '/lib*' '/usr/lib*'; do
if test "${LIBC_PATH}" = ""; then
LIBC_PATH=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1`
fi

View File

@@ -1,32 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=4
inherit multilib
DESCRIPTION="Use most socks-friendly applications with Tor"
HOMEPAGE="https://code.google.com/p/torsocks"
SRC_URI="https://${PN}.googlecode.com/files/${PN}-1.2.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~x86"
IUSE="static-libs"
# We do not depend on tor which might be running on a different box
DEPEND=""
RDEPEND="${DEPEND}"
src_configure() {
econf $(use_enable static-libs static)
}
src_install() {
emake DESTDIR="${D}" install
#Remove libtool .la files
cd "${D}"/usr/$(get_libdir)/torsocks
rm -f *.la
}