summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2017-01-17 18:52:35 +0100
committerDavid Seifert <soap@gentoo.org>2017-01-18 10:19:26 +0100
commit154062b3f70a8de7448c0493094b11dc47cce9c8 (patch)
treef7da14b66fdb3eaa9a59015ca4f410fbba12b3f3 /net-proxy
parentnet-p2p/opendchub: remove unused patch (diff)
downloadgentoo-154062b3f70a8de7448c0493094b11dc47cce9c8.tar.gz
gentoo-154062b3f70a8de7448c0493094b11dc47cce9c8.tar.bz2
gentoo-154062b3f70a8de7448c0493094b11dc47cce9c8.zip
net-proxy/c-icap: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3516
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/c-icap/files/c-icap-0.1.3+db-5.0.patch13
-rw-r--r--net-proxy/c-icap/files/c-icap-0.1.4-crosscompile.patch72
-rw-r--r--net-proxy/c-icap/files/c-icap-0.1.6-implicit.patch12
-rw-r--r--net-proxy/c-icap/files/c-icap-0.2.2-asneeded.patch27
-rw-r--r--net-proxy/c-icap/files/c-icap.init.219
5 files changed, 0 insertions, 143 deletions
diff --git a/net-proxy/c-icap/files/c-icap-0.1.3+db-5.0.patch b/net-proxy/c-icap/files/c-icap-0.1.3+db-5.0.patch
deleted file mode 100644
index 6be5fafb2311..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.1.3+db-5.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: c_icap-0.1.3/modules/bdb_tables.c
-===================================================================
---- c_icap-0.1.3.orig/modules/bdb_tables.c
-+++ c_icap-0.1.3/modules/bdb_tables.c
-@@ -108,7 +108,7 @@ int bdb_table_do_real_open(struct ci_loo
- }
-
-
--#if(DB_VERSION_MINOR>=1)
-+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- if ((ret = dbdata->db->open( dbdata->db, NULL, table->path, NULL,
- DB_BTREE, DB_RDONLY|DB_THREAD, 0)) != 0) {
- #else
diff --git a/net-proxy/c-icap/files/c-icap-0.1.4-crosscompile.patch b/net-proxy/c-icap/files/c-icap-0.1.4-crosscompile.patch
deleted file mode 100644
index 2e2a325989bb..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.1.4-crosscompile.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/configure.in 2010-12-21 17:50:08.000000000 +0100
-+++ b/configure.in 2011-06-10 00:24:06.000000000 +0200
-@@ -423,10 +423,8 @@
- )
-
- dnl Checking if interprocess posix semaphores works....
--POSIX_SEMAPHORES="0"
--AC_MSG_CHECKING(if posix 1003.1b interprocess semaphores works)
--AC_TRY_RUN(
--[
-+AC_CACHE_CHECK([if posix 1003.1b interprocess semaphores works], ac_cv_10031b_ipc_sem,
-+[AC_TRY_RUN([
- #include <semaphore.h>
- #include <sys/wait.h>
-
-@@ -452,18 +450,24 @@
- exit(0);
- }
- ],
--AC_DEFINE(HAVE_POSIX_SEMAPHORES,1,[Define HAVE_POSIX_SEMAPHORES if posix 1003.1b semaphores works])
--POSIX_SEMAPHORES="1"
--AC_MSG_RESULT(yes),
--AC_MSG_RESULT(no)
-+ac_cv_10031b_ipc_sem=yes,
-+ac_cv_10031b_ipc_sem=no,
-+[AC_MSG_ERROR([cross-compiling,
-+ presetting ac_cv_10031b_ipc_sem=(yes|no) will help])]
- )
-+])
-+AS_IF(
-+ [test $ac_cv_10031b_ipc_sem = yes],
-+ [AC_DEFINE(HAVE_POSIX_SEMAPHORES,1,[Define HAVE_POSIX_SEMAPHORES if posix 1003.1b semaphores works])
-+ POSIX_SEMAPHORES="1"
-+ ],[
-+ POSIX_SEMAPHORES="0"
-+ ])
- AC_SUBST(POSIX_SEMAPHORES)
-
- dnl Checking for file locking
--POSIX_FILE_LOCK="0"
--AC_MSG_CHECKING(if fcntl file locking works)
--AC_TRY_RUN(
--[
-+AC_CACHE_CHECK([if fcntl file locking works], ac_cv_fcntl,
-+[AC_TRY_RUN([
- #include <unistd.h>
- #include <fcntl.h>
-
-@@ -487,11 +491,19 @@
- return 0;
- }
- ],
--AC_DEFINE(HAVE_POSIX_FILE_LOCK,1,[Define HAVE_POSIX_FILE_LOCK if posix fcntl file locking works])
--POSIX_FILE_LOCK="1"
--AC_MSG_RESULT(yes),
--AC_MSG_RESULT(no)
-+ac_cv_fcntl=yes,
-+ac_cv_fcntl=no,
-+[AC_MSG_ERROR([cross-compiling,
-+ presetting ac_cv_fcntl=(yes|no) will help])]
- )
-+])
-+AS_IF(
-+ [test $ac_cv_fcntl = yes],
-+ [AC_DEFINE(HAVE_POSIX_FILE_LOCK,1,[Define HAVE_POSIX_FILE_LOCK if posix fcntl file locking works])
-+ POSIX_FILE_LOCK="1"
-+ ],[
-+ POSIX_FILE_LOCK="0"
-+ ])
- AC_SUBST(POSIX_FILE_LOCK)
-
- #pthread_rwlock
diff --git a/net-proxy/c-icap/files/c-icap-0.1.6-implicit.patch b/net-proxy/c-icap/files/c-icap-0.1.6-implicit.patch
deleted file mode 100644
index aabffea7dc53..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.1.6-implicit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: c_icap-0.1.6/txtTemplate.c
-===================================================================
---- c_icap-0.1.6.orig/txtTemplate.c
-+++ c_icap-0.1.6/txtTemplate.c
-@@ -27,6 +27,7 @@
- #include <sys/param.h>
- #include <assert.h>
- #include <stdlib.h>
-+#include <ctype.h>
-
- #include "body.h"
- #include "c-icap.h"
diff --git a/net-proxy/c-icap/files/c-icap-0.2.2-asneeded.patch b/net-proxy/c-icap/files/c-icap-0.2.2-asneeded.patch
deleted file mode 100644
index 17d5877d3ad5..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.2.2-asneeded.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: c_icap-0.2.1/Makefile.am
-===================================================================
---- c_icap-0.2.1.orig/Makefile.am
-+++ c_icap-0.2.1/Makefile.am
-@@ -37,7 +37,7 @@ c_icap_SOURCES = aserver.c request.c cfg
- # libicapapi ......
- libicapapi_la_CFLAGS= -Iinclude/ @ZLIB_ADD_FLAG@ -DCI_BUILD_LIB
-
--libicapapi_la_LIBADD = @ZLIB_ADD_LDADD@
-+libicapapi_la_LIBADD = @ZLIB_ADD_LDADD@ @DL_ADD_FLAG@ @THREADS_LDADD@
- libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@
-
-
-@@ -47,10 +47,10 @@ c_icap_CFLAGS= -Iinclude/ -DCONFDIR=\"$(
- -DSERVDIR=\"$(SERVICESDIR)\" -DLOGDIR=\"$(LOGDIR)\" \
- -DDATADIR=\"$(DATADIR)\"
-
--c_icap_LDADD = libicapapi.la @DL_ADD_FLAG@ @THREADS_LDADD@
--c_icap_LDFLAGS = -rdynamic -rpath @libdir@ @THREADS_LDFLAGS@
-+c_icap_LDADD = libicapapi.la
-+c_icap_LDFLAGS = -rdynamic @THREADS_LDFLAGS@
-
--EXT_PROGRAMS_MKLIB = -licapapi @DL_ADD_FLAG@ @THREADS_LDADD@
-+EXT_PROGRAMS_MKLIB = -licapapi
-
-
- INCS = access.h body.h cfg_param.h c-icap-conf.h c-icap.h ci_threads.h \
diff --git a/net-proxy/c-icap/files/c-icap.init.2 b/net-proxy/c-icap/files/c-icap.init.2
deleted file mode 100644
index d48283fc63e8..000000000000
--- a/net-proxy/c-icap/files/c-icap.init.2
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-pidfile=$(awk '$1 == "PidFile" { print $2 }' /etc/c-icap/c-icap.conf)
-
-command="/usr/libexec/c-icap"
-command_arguments="${EXTRA_OPTS}"
-
-depend() {
- need localmount
-}
-
-start_pre() {
- cmdsocket=$(awk '$1 == "CommandsSocket" { print $2 }' /etc/c-icap/c-icap.conf)
-
- checkpath -d "$(dirname "${cmdsocket}")" "$(dirname "${pidfile}")"
-}