diff options
Diffstat (limited to 'source/n/ca-certificates/patches')
| -rw-r--r-- | source/n/ca-certificates/patches/fixup_DESTDIR.diff | 55 | ||||
| -rw-r--r-- | source/n/ca-certificates/patches/remove_debconf.diff | 12 |
2 files changed, 20 insertions, 47 deletions
diff --git a/source/n/ca-certificates/patches/fixup_DESTDIR.diff b/source/n/ca-certificates/patches/fixup_DESTDIR.diff index 291848f69..964064184 100644 --- a/source/n/ca-certificates/patches/fixup_DESTDIR.diff +++ b/source/n/ca-certificates/patches/fixup_DESTDIR.diff @@ -1,39 +1,15 @@ -diff -Nur ca-certificates-20111211.orig/Makefile ca-certificates-20111211/Makefile ---- ca-certificates-20111211.orig/Makefile 2011-12-11 13:54:02.000000000 -0600 -+++ ca-certificates-20111211/Makefile 2011-12-17 23:05:37.590951594 -0600 -@@ -17,7 +17,7 @@ - - install: - for dir in $(SUBDIRS); do \ -- mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \ -+ mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \ - $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \ - done - for dir in sbin; do \ -diff -Nur ca-certificates-20111211.orig/cacert.org/Makefile ca-certificates-20111211/cacert.org/Makefile ---- ca-certificates-20111211.orig/cacert.org/Makefile 2011-12-11 13:54:02.000000000 -0600 -+++ ca-certificates-20111211/cacert.org/Makefile 2011-12-17 23:06:16.927521153 -0600 -@@ -9,5 +9,6 @@ - - install: - cat root.crt class3.crt > cacert.org.crt -+ mkdir -p $(CERTSDIR) - install -m 644 cacert.org.crt $(CERTSDIR)/cacert.org.crt - -diff -Nur ca-certificates-20111211.orig/debconf.org/Makefile ca-certificates-20111211/debconf.org/Makefile ---- ca-certificates-20111211.orig/debconf.org/Makefile 2011-12-11 13:54:02.000000000 -0600 -+++ ca-certificates-20111211/debconf.org/Makefile 2011-12-17 23:06:27.118409644 -0600 +--- ./cacert.org/Makefile.orig ++++ ./cacert.org/Makefile @@ -7,6 +7,7 @@ clean: install: + mkdir -p $(CERTSDIR) for p in *.crt; do \ - install -m 644 $$p $(CERTSDIR)/$$p ; \ + install -m 644 $$p $(CERTSDIR)/cacert.org_$$p ; \ done -diff -Nur ca-certificates-20111211.orig/mozilla/Makefile ca-certificates-20111211/mozilla/Makefile ---- ca-certificates-20111211.orig/mozilla/Makefile 2011-12-11 13:54:02.000000000 -0600 -+++ ca-certificates-20111211/mozilla/Makefile 2011-12-17 23:06:34.556328253 -0600 +--- ./mozilla/Makefile.orig ++++ ./mozilla/Makefile @@ -9,6 +9,7 @@ -rm -f *.crt @@ -42,18 +18,27 @@ diff -Nur ca-certificates-20111211.orig/mozilla/Makefile ca-certificates-2011121 for p in *.crt; do \ install -m 644 $$p $(CERTSDIR)/$$p ; \ done -diff -Nur ca-certificates-20111211.orig/sbin/Makefile ca-certificates-20111211/sbin/Makefile ---- ca-certificates-20111211.orig/sbin/Makefile 2011-12-11 13:54:02.000000000 -0600 -+++ ca-certificates-20111211/sbin/Makefile 2011-12-17 23:07:03.841007810 -0600 +--- ./sbin/Makefile.orig ++++ ./sbin/Makefile @@ -8,4 +8,5 @@ clean: install: + mkdir -p $(DESTDIR)/usr/sbin install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/ -diff -Nur ca-certificates-20111211.orig/spi-inc.org/Makefile ca-certificates-20111211/spi-inc.org/Makefile ---- ca-certificates-20111211.orig/spi-inc.org/Makefile 2011-12-11 13:54:02.000000000 -0600 -+++ ca-certificates-20111211/spi-inc.org/Makefile 2011-12-17 23:08:18.499190893 -0600 +--- ./Makefile.orig ++++ ./Makefile +@@ -17,7 +17,7 @@ + + install: + for dir in $(SUBDIRS); do \ +- mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \ ++ mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \ + $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \ + done + for dir in sbin; do \ +--- ./spi-inc.org/Makefile.orig ++++ ./spi-inc.org/Makefile @@ -7,6 +7,7 @@ clean: diff --git a/source/n/ca-certificates/patches/remove_debconf.diff b/source/n/ca-certificates/patches/remove_debconf.diff deleted file mode 100644 index 58fce4226..000000000 --- a/source/n/ca-certificates/patches/remove_debconf.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur ca-certificates-20111211.orig/Makefile ca-certificates-20111211/Makefile ---- ca-certificates-20111211.orig/Makefile 2011-12-17 23:10:21.709842750 -0600 -+++ ca-certificates-20111211/Makefile 2011-12-17 23:10:10.096969815 -0600 -@@ -3,7 +3,7 @@ - # - - CERTSDIR = /usr/share/ca-certificates --SUBDIRS = mozilla cacert.org debconf.org spi-inc.org -+SUBDIRS = mozilla cacert.org spi-inc.org - - all: - for dir in $(SUBDIRS); do \ |