summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2020-09-11 21:41:08 -0700
committerPatrick McLean <chutzpah@gentoo.org>2020-09-11 21:41:08 -0700
commitb6b6a736d1b2f248319fc8f9bce3179551000012 (patch)
treef1bf4c0446c38fc6a9d7ba62b42094310af4c024 /sys-libs/libxcrypt/files
parentsys-libs/libxcrypt-4.4.17: Bump (diff)
downloadgentoo-b6b6a736d1b2f248319fc8f9bce3179551000012.tar.gz
gentoo-b6b6a736d1b2f248319fc8f9bce3179551000012.tar.bz2
gentoo-b6b6a736d1b2f248319fc8f9bce3179551000012.zip
sys-libs/libxcrypt: Remove old
Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'sys-libs/libxcrypt/files')
-rw-r--r--sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch40
-rw-r--r--sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch25
-rw-r--r--sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch17
3 files changed, 0 insertions, 82 deletions
diff --git a/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch b/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch
deleted file mode 100644
index 150ff99ab2f9..000000000000
--- a/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urN libxcrypt-3.0.2/src/crypt_util.c libxcrypt-3.0.2.new/src/crypt_util.c
---- libxcrypt-3.0.2/src/crypt_util.c 2007-10-25 15:17:46.000000000 +0200
-+++ libxcrypt-3.0.2.new/src/crypt_util.c 2013-02-04 12:45:20.560191479 +0100
-@@ -30,8 +30,7 @@
- #endif
- #include <string.h>
-
--#include <bits/libc-lock.h>
--#define __libc_lock_t pthread_mutex_t
-+#include <pthread.h>
-
- #ifndef STATIC
- #define STATIC static
-@@ -265,7 +264,7 @@
- */
- struct crypt_data _ufc_foobar;
-
--__libc_lock_define_initialized (static, _ufc_tables_lock)
-+static pthread_mutex_t _ufc_tables_lock = PTHREAD_MUTEX_INITIALIZER;
-
- #ifdef DEBUG
-
-@@ -362,7 +361,7 @@
- #endif
-
- if(small_tables_initialized == 0) {
-- __libc_lock_lock (_ufc_tables_lock);
-+ pthread_mutex_lock (&_ufc_tables_lock);
- if(small_tables_initialized)
- goto small_tables_done;
-
-@@ -471,7 +470,7 @@
- }
- small_tables_initialized = 1;
- small_tables_done:
-- __libc_lock_unlock(_ufc_tables_lock);
-+ pthread_mutex_unlock (&_ufc_tables_lock);
- }
-
- /*
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch
deleted file mode 100644
index aee7d7229b1b..000000000000
--- a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-multibuild.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 3502a5c..afb8079 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -84,11 +84,7 @@ noinst_HEADERS = \
- test/des-cases.h \
- test/crypt-kat.inc
-
--if ENABLE_XCRYPT_COMPAT_FILES
- nodist_include_HEADERS += xcrypt.h
--else
--nodist_noinst_HEADERS += xcrypt.h
--endif
-
- noinst_PROGRAMS = \
- lib/gen-des-tables
-@@ -137,7 +133,7 @@ uninstall_hook_targets = \
- uninstall-hook-pkgconfig
- install-data-hook-pkgconfig:
- cd $(DESTDIR)$(pkgconfigdir) && \
-- $(LN_S) libxcrypt.pc libcrypt.pc
-+ $(LN_S) -f libxcrypt.pc libcrypt.pc
- uninstall-hook-pkgconfig:
- -rm -f $(DESTDIR)$(pkgconfigdir)/libcrypt.pc
-
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch
deleted file mode 100644
index 0ca1563995bd..000000000000
--- a/sys-libs/libxcrypt/files/libxcrypt-4.4.10-pythonver.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 16885c8..fd8c8e3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -247,11 +247,7 @@ ENABLE_CRYPT_KAT_GEN="no"
- # This way we just need one call to AC_PATH_PROGS to likely get a
- # suitable version of Python. The version check afterwards is for
- # the case just a generic 'python3' or 'python' executable was found.
--PYTHON_CANDIDATE_VERSIONS="python3 python"
--
--for ver in `seq 6 1 10`; do
-- PYTHON_CANDIDATE_VERSIONS="python3.$ver $PYTHON_CANDIDATE_VERSIONS"
--done
-+PYTHON_CANDIDATE_VERSIONS="${EPYTHON}"
-
- AC_PATH_PROGS([PYTHON], [$PYTHON_CANDIDATE_VERSIONS], [])
-