Create and use oops user and group (#133436). Use keepdir where is the case. Make it compilable with custom LDFLAGS, including --as-needed. Don't install

Package-Manager: portage-2.0.54-r2

4 files changed, 22 insertions, 17 deletions

diff --git a/net-proxy/oops/files/digest-oops-1.5.24_pre20050503 b/net-proxy/oops/files/digest-oops-1.5.24_pre20050503
deleted file mode 100644
index f1fbcce3d239..000000000000
--- a/net-proxy/oops/files/digest-oops-1.5.24_pre20050503
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bfa19752af517bb5a6cd746acf61064c oops-1.5.23.tar.gz 473290
-RMD160 295122ff9ce7e045cf7ddda035479056ba9e5881 oops-1.5.23.tar.gz 473290
-SHA256 b9ab7c0b5b11de7944f098d6f99158fe1b9c3b9cf82fe7827685c6cec8ccfa04 oops-1.5.23.tar.gz 473290
-MD5 8fbd0e763338eba31949d2a20217707a oops-1.5.24_pre20050503.patch.gz 101103
-RMD160 dffdc6842db8c78d87c26fe180302b56608f1f2e oops-1.5.24_pre20050503.patch.gz 101103
-SHA256 954e59d046096867a8e818bf47190ab06c8416abb80d151757825a664192aded oops-1.5.24_pre20050503.patch.gz 101103
diff --git a/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1 b/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1
index f1fbcce3d239..61ed89b1cbe4 100644
--- a/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1
+++ b/net-proxy/oops/files/digest-oops-1.5.24_pre20050503-r1
@@ -1,6 +1,2 @@
 MD5 bfa19752af517bb5a6cd746acf61064c oops-1.5.23.tar.gz 473290
-RMD160 295122ff9ce7e045cf7ddda035479056ba9e5881 oops-1.5.23.tar.gz 473290
-SHA256 b9ab7c0b5b11de7944f098d6f99158fe1b9c3b9cf82fe7827685c6cec8ccfa04 oops-1.5.23.tar.gz 473290
 MD5 8fbd0e763338eba31949d2a20217707a oops-1.5.24_pre20050503.patch.gz 101103
-RMD160 dffdc6842db8c78d87c26fe180302b56608f1f2e oops-1.5.24_pre20050503.patch.gz 101103
-SHA256 954e59d046096867a8e818bf47190ab06c8416abb80d151757825a664192aded oops-1.5.24_pre20050503.patch.gz 101103
diff --git a/net-proxy/oops/files/modules-as-needed.patch b/net-proxy/oops/files/modules-as-needed.patch
new file mode 100644
index 000000000000..41703cd389ee
--- /dev/null
+++ b/net-proxy/oops/files/modules-as-needed.patch
@@ -0,0 +1,17 @@
+diff -Nru src/modules.orig/Makefile.in src/modules/Makefile.in
+--- src/modules.orig/Makefile.in	2006-05-20 01:28:11.000000000 +0300
++++ src/modules/Makefile.in	2006-05-20 01:29:11.827604500 +0300
+@@ -110,11 +110,11 @@
+ 
+ passwd_pgsql.so: passwd_sql.c ../modules.h ../oops.h
+ 	${CC} ${CFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
+-	${LD} $(SOFLAGS) $(LDFLAGS) $(LIBS) -o passwd_pgsql.so passwd_pgsql.o $(PGSQL_LIB)
++	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_pgsql.so passwd_pgsql.o $(LIBS) $(PGSQL_LIB)
+ 
+ passwd_mysql.so: passwd_sql.c ../modules.h ../oops.h
+ 	${CC} ${CFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
+-	${LD} $(SOFLAGS) $(LDFLAGS) $(LIBS) -o passwd_mysql.so passwd_mysql.o $(MYSQL_LIB)
++	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_mysql.so passwd_mysql.o $(LIBS) $(MYSQL_LIB)
+ 
+ passwd_pgsql.o: passwd_sql.c ../modules.h ../oops.h
+ 	${CC} ${CFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
diff --git a/net-proxy/oops/files/oops.cfg b/net-proxy/oops/files/oops.cfg
index 03dc19dc83c5..3dc96fad2331 100644
--- a/net-proxy/oops/files/oops.cfg
+++ b/net-proxy/oops/files/oops.cfg
@@ -1,9 +1,8 @@
 ##
-#  nameservers. Use your own, not our.
+#  nameservers. Multiple nameserver entries are allowed.
 ## 
 
-nameserver 195.114.128.50
-nameserver 193.219.193.130
+nameserver 127.0.0.1
 
 ##
 #  Ports and address to use for HTTP and ICP
@@ -16,11 +15,10 @@ icp_port	3130
 ##
 ## Change euid to that user
 ##
-## WARNING: if you use 'userid, then you 'reconfigure will not be able to
-##	    open new sockets on reserved (< 1024) ports and will not be able
-##	    to return to original userid.
+## WARNING: if you use userid, then you will not be able to open new sockets on
+##	    reserved (< 1024) ports and will not be able to return to original userid.
 ##
-userid	squid
+userid	oops
 
 ##
 ## Change root directory. If don't know exactly what are you doing -