Build using the set of provided patches instead of via the postgresql

source tree.

Makefile

@@ -1,5 +1,5 @@
 MAKE_BANKAPI=$(MAKE) -f debian/bankapi/rules
-MAKE_POSTGRES=$(MAKE) -f debian/postgresql-pgcrypto-signatures/rules
+MAKE_POSTGRES=$(MAKE) -f debian/postgresql-pgcrypto-openpgp/rules
 
 all: deb
 

README.md

@@ -180,9 +180,9 @@ installation:
   pg\_hba.conf file: local www-data bankapi peer
 - To optionally install the test bank data: sudo -u postgres psql --dbname=bankapi --single-transaction --no-psqlrc --file=testdata/index.sql
 
-### postgresql-pgcrypto-signatures-9.3.deb
+### postgresql-pgcrypto-openpgp-9.3.deb
 
 This is an extension to the pgcrypto PostgreSQL extension. The extension only
 installs with the extended functions, all functions normally in pgcrypto is
 still accessed from the standard pgcrypto extension. The extension is called
-pgcrypto\_signatures.
+pgcrypto\_openpgp.

debian/postgresql-pgcrypto-signatures/rules → debian/postgresql-pgcrypto-openpgp/rules

@@ -2,9 +2,9 @@
 
 VERSION=1.2-1
 PGVERSION=$$(pg_config --version | sed 's/.* //' | cut -f1-2 -d.)
-PACKAGE=postgresql-pgcrypto-signatures-$(PGVERSION)
+PACKAGE=postgresql-pgcrypto-openpgp-$(PGVERSION)
 ROOT=$(PWD)
-DEBIAN=$(ROOT)/debian/postgresql-pgcrypto-signatures
+DEBIAN=$(ROOT)/debian/postgresql-pgcrypto-openpgp
 PACKAGEDIR=$(ROOT)/$(PACKAGE)-$(VERSION)
 BUILDDIR=$(ROOT)/$(PACKAGE)-$(VERSION)-build
 CP=cp -p
@@ -17,16 +17,16 @@ build: clean
 	mkdir -p "$(PACKAGEDIR)" \
 		"$(PACKAGEDIR)/DEBIAN"
 	mkdir -p "$(BUILDDIR)"
-	if [ ! -e "$(ROOT)/postgres/.git" ]; then \
-		git submodule update --init; \
-	fi
-	tar -C postgres -cf - --exclude=.git . | tar -C "$(BUILDDIR)" -xf -
-	(cd "$(BUILDDIR)"; patch -t -p1 < "$(DEBIAN)/000-build.patch")
-	(cd "$(BUILDDIR)"; patch -t -p1 < "$(DEBIAN)/001-disablefunctions.patch")
-	(cd "$(BUILDDIR)/contrib/pgcrypto"; USE_PGXS=1 $(MAKE))
-	perl -p -i -e 's/pgcrypto/pgcrypto_signatures/' "$(BUILDDIR)/contrib/pgcrypto/pgcrypto.control" "$(BUILDDIR)/contrib/pgcrypto/pgcrypto--1.2.sql"
-	(cd "$(BUILDDIR)/contrib/pgcrypto"; USE_PGXS=1 $(MAKE) DESTDIR=$(PACKAGEDIR) install)
-	(cd "$(PACKAGEDIR)";  find . -type f -name "*pgcrypto*"  -exec rename 's/pgcrypto/pgcrypto_signatures/' '{}' \;)
+	(cd "$(BUILDDIR)"; apt-get source postgresql-contrib-$(PGVERSION))
+	(cd "$(BUILDDIR)" ; \
+		set -e; \
+		cd */contrib/pgcrypto; \
+		for file in $$(ls $(DEBIAN)/patches/* | sort -n); do \
+			patch -t -p1 < "$$file"; \
+		done; \
+		$(MAKE); \
+		$(MAKE) DESTDIR=$(PACKAGEDIR) install ; \
+	)
 
 install: