summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2011-05-29 16:03:46 +0000
committerChristian Ruppert <idl0r@gentoo.org>2011-05-29 16:03:46 +0000
commitfadd58298f6417d050d609f340c35d0ecb224c9d (patch)
tree606c9d2b86a827ef4d6a953bbd19b1a2bd2fc9cc /sys-auth/libnss-cache/files
parentsparc stable wrt #359091 (diff)
downloadhistorical-fadd58298f6417d050d609f340c35d0ecb224c9d.tar.gz
historical-fadd58298f6417d050d609f340c35d0ecb224c9d.tar.bz2
historical-fadd58298f6417d050d609f340c35d0ecb224c9d.zip
Version bump, also fixes bug 368951. Remove old versions. Add multilib support. Add myself as secondary maintainer.
Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64
Diffstat (limited to 'sys-auth/libnss-cache/files')
-rw-r--r--sys-auth/libnss-cache/files/0.1-make-install.patch29
-rw-r--r--sys-auth/libnss-cache/files/libnss-cache-0.10-make.patch27
-rw-r--r--sys-auth/libnss-cache/files/libnss-cache-0.10.1-make.patch49
3 files changed, 49 insertions, 56 deletions
diff --git a/sys-auth/libnss-cache/files/0.1-make-install.patch b/sys-auth/libnss-cache/files/0.1-make-install.patch
deleted file mode 100644
index c245f2d25308..000000000000
--- a/sys-auth/libnss-cache/files/0.1-make-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nuar libnss-cache.orig/Makefile libnss-cache/Makefile
---- libnss-cache.orig/Makefile 2008-03-22 20:22:50.000000000 -0700
-+++ libnss-cache/Makefile 2009-03-18 15:45:19.244473770 -0700
-@@ -3,19 +3,21 @@
- CFLAGS=-Wall -fPIC
- LIBRARY=libnss_cache.so.2.0
- LINKS=libnss_cache.so.2 libnss_cache.so
-+DESTDIR=
- PREFIX=/usr
- BUILD=.libs
- LIBDIR=$(PREFIX)/lib
-+SONAME=libnss_cache.so.2
-
- nss_cache:
- [ -d $(BUILD) ] || mkdir $(BUILD)
- $(CC) $(CFLAGS) -c nss_cache.c -o $(BUILD)/nss_cache.o
-- $(CC) -shared -o $(BUILD)/$(LIBRARY) $(BUILD)/nss_cache.o
-+ $(CC) -shared -Wl,-soname,$(SONAME) -o $(BUILD)/$(LIBRARY) $(BUILD)/nss_cache.o
-
- clean:
- rm -rf $(BUILD)
-
- install:
-- [ -d $(LIBDIR) ] || install -d $(LIBDIR)
-- install $(BUILD)/$(LIBRARY) $(LIBDIR)
-- cd $(LIBDIR); for link in $(LINKS); do ln -sf $(LIBRARY) $$link ; done
-+ [ -d $(DESTDIR)/$(PREFIX)/$(LIBDIR) ] || install -d $(DESTDIR)/$(PREFIX)/$(LIBDIR)
-+ install $(BUILD)/$(LIBRARY) $(DESTDIR)/$(PREFIX)/$(LIBDIR)
-+ cd $(DESTDIR)/$(PREFIX)/$(LIBDIR); for link in $(LINKS); do ln -sf $(LIBRARY) $$link ; done
diff --git a/sys-auth/libnss-cache/files/libnss-cache-0.10-make.patch b/sys-auth/libnss-cache/files/libnss-cache-0.10-make.patch
deleted file mode 100644
index 9bf5f5773cd1..000000000000
--- a/sys-auth/libnss-cache/files/libnss-cache-0.10-make.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nuar libnss-cache-0.10.orig/Makefile libnss-cache-0.10/Makefile
---- libnss-cache-0.10.orig/Makefile 2011-01-10 19:56:01.000000000 +0000
-+++ libnss-cache-0.10/Makefile 2011-01-13 06:18:03.630052109 +0000
-@@ -1,16 +1,17 @@
--CC=gcc
-+CC?=gcc
- #CFLAGS=-Wall -Wstrict-prototypes -Werror -fPIC -DDEBUG -g -O0
--CFLAGS=-Wall -Wstrict-prototypes -Werror -fPIC
-+CFLAGS := $(CFLAGS) -Wall -Wstrict-prototypes -fPIC
-+LDFLAGS+=
- LIBRARY=libnss_cache.so.2.0
- LINKS=libnss_cache.so.2 libnss_cache.so
--DESTDIR=/
-+DESTDIR?=
- PREFIX=$(DESTDIR)/usr
- BUILD=.libs
- BUILD64=.libs64
- BUILD32=.libs32
--LIBDIR=$(PREFIX)/lib
--LIBDIR64=$(PREFIX)/lib64
--LIBDIR32=$(PREFIX)/lib32
-+LIBDIR?=$(PREFIX)/lib
-+LIBDIR64?=$(PREFIX)/lib64
-+LIBDIR32?=$(PREFIX)/lib32
- SONAME=libnss_cache.so.2
- LD_SONAME=-Wl,-soname,$(SONAME)
- TESTBIN=.testbin
diff --git a/sys-auth/libnss-cache/files/libnss-cache-0.10.1-make.patch b/sys-auth/libnss-cache/files/libnss-cache-0.10.1-make.patch
new file mode 100644
index 000000000000..b1ba149529c3
--- /dev/null
+++ b/sys-auth/libnss-cache/files/libnss-cache-0.10.1-make.patch
@@ -0,0 +1,49 @@
+diff --git a/Makefile b/Makefile
+index 1e34d3b..563e467 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,16 +1,16 @@
+-CC=gcc
++CC?=gcc
+ #CFLAGS=-Wall -Wstrict-prototypes -Werror -fPIC -DDEBUG -g -O0
+-CFLAGS=-Wall -Wstrict-prototypes -Werror -fPIC
++CFLAGS+=-Wall -Wstrict-prototypes -fPIC
+ LIBRARY=libnss_cache.so.2.0
+ LINKS=libnss_cache.so.2 libnss_cache.so
+-DESTDIR=/
+-PREFIX=$(DESTDIR)/usr
++DESTDIR?=
++PREFIX?=$(DESTDIR)/usr
+ BUILD=.libs
+ BUILD64=.libs64
+ BUILD32=.libs32
+-LIBDIR=$(PREFIX)/lib
+-LIBDIR64=$(PREFIX)/lib64
+-LIBDIR32=$(PREFIX)/lib32
++LIBDIR?=$(PREFIX)/lib
++LIBDIR64?=$(PREFIX)/lib64
++LIBDIR32?=$(PREFIX)/lib32
+ SONAME=libnss_cache.so.2
+ LD_SONAME=-Wl,-soname,$(SONAME)
+ TESTBIN=.testbin
+@@ -97,17 +97,17 @@ install_amd64: install32
+ nss_cache:
+ [ -d $(BUILD) ] || mkdir $(BUILD)
+ $(CC) $(CFLAGS) -c nss_cache.c -o $(BUILD)/nss_cache.o
+- $(CC) -shared $(LD_SONAME) -o $(BUILD)/$(LIBRARY) $(BUILD)/nss_cache.o
++ $(CC) $(LDFLAGS) -shared $(LD_SONAME) -o $(BUILD)/$(LIBRARY) $(BUILD)/nss_cache.o
+
+ nss_cache64: nss_cache
+ [ -d $(BUILD64) ] || mkdir $(BUILD64)
+ $(CC) $(CFLAGS) -m64 -c nss_cache.c -o $(BUILD64)/nss_cache.o
+- $(CC) -m64 -shared $(LD_SONAME) -o $(BUILD64)/$(LIBRARY) $(BUILD64)/nss_cache.o
++ $(CC) $(LDFLAGS) -m64 -shared $(LD_SONAME) -o $(BUILD64)/$(LIBRARY) $(BUILD64)/nss_cache.o
+
+ nss_cache32: nss_cache
+ [ -d $(BUILD32) ] || mkdir $(BUILD32)
+ $(CC) $(CFLAGS) -m32 -c nss_cache.c -o $(BUILD32)/nss_cache.o
+- $(CC) -m32 -shared $(LD_SONAME) -o $(BUILD32)/$(LIBRARY) $(BUILD32)/nss_cache.o
++ $(CC) $(LDFLAGS) -m32 -shared $(LD_SONAME) -o $(BUILD32)/$(LIBRARY) $(BUILD32)/nss_cache.o
+
+ clean:
+ rm -rf $(BUILD)