diff options
Diffstat (limited to 'app-backup')
| -rw-r--r-- | app-backup/bup/Manifest | 6 | ||||
| -rw-r--r-- | app-backup/bup/bup-0.23a.ebuild (renamed from app-backup/bup/bup-0.23.ebuild) | 4 | ||||
| -rw-r--r-- | app-backup/bup/files/p1.patch | 52 | ||||
| -rw-r--r-- | app-backup/bup/files/p2.patch | 24 |
4 files changed, 2 insertions, 84 deletions
diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest index ce9a034..9c98936 100644 --- a/app-backup/bup/Manifest +++ b/app-backup/bup/Manifest @@ -1,7 +1,5 @@ -AUX p1.patch 1439 RMD160 f37d213cab2c7b9095e1eb0dfebff4358ce14f99 SHA1 88b5e9f43665886bfb3ce2df0902f4adf0426e13 SHA256 a3261d22b95f3546d22497de38c0b61e5cb3e05baed1af9bc30267543578c3b4 -AUX p2.patch 698 RMD160 65c26636bb7f8ab8ca33fa901b025ca417ee7ca9 SHA1 7eb513f9383f78be8f2424063e15f9c6b15c0fbe SHA256 5e3a5d6c61758ed5caa0da8d88e0efc8b9cd18deb07284d35d43ec4bc56677de DIST bup-0.22a.tar.gz 317660 RMD160 6c0e5c68758bb47b43bd0c9565c97651680ad11f SHA1 4a6032377b0ada54dd594da1ba8c8fdcf33cf4d2 SHA256 b8a25e57ccec3be4659a4caa66f85bbf39ea4832ac609d921222a70164080cff -DIST bup-0.23.tar.gz 326349 RMD160 411861f0d285ac49ba891bf82eded771182dbdf7 SHA1 d6d1964505c87eacd47ff12089a79f3f311c1497 SHA256 867e7bab6e65a68d23c469dd5a266e2f4a867a56a9586bc76c9bf022ceb7fc03 +DIST bup-0.23a.tar.gz 329580 RMD160 cf3087c8f138eddbabd12e27d915fefff42a4a0a SHA1 d8b9704c0658f76f6627de464f4900d8236e5f92 SHA256 c30e1b80a119b92a1dae22a13d56f0ecd45309920cf7d79eb121b3a8ac32c385 EBUILD bup-0.22a.ebuild 937 RMD160 17768fc4714853359a255df4d518cb969a70918b SHA1 c50ad176279bdbef6ca8bd28f1de8184e0501aaf SHA256 0cb5fa01a9945e314f4639aa3c1ba71c05ae777d4fde56f9ac3987e9a1ae896e -EBUILD bup-0.23.ebuild 1026 RMD160 9dc33c1499e2912d901134342effad4b41babbf3 SHA1 86e7bd4c46e9e5db8ec71ed973d1e51fef486201 SHA256 51f9154769440f4bed4d269f5b555858f4181c98eac36b351c65777b70a47cbe +EBUILD bup-0.23a.ebuild 977 RMD160 14ea28fb7e2180c93ed6ec386408b5ef70c377cd SHA1 c8a019ee13ac80624edff0f7d5935a5748e7b1b1 SHA256 e96b9cbabbe8412d86fafade5a636d9fa62b3b95079eb9b9f9b25ee5f6ed9c9e EBUILD bup-9999.ebuild 851 RMD160 506c1337a76757acd17893db0395e912f792e830 SHA1 499ebcf153559860b7d7bb9ad90e272620daeafd SHA256 980181ad752fac7f4f76dec40237fc02941b51bdafa62cc3d664df15f98a393b diff --git a/app-backup/bup/bup-0.23.ebuild b/app-backup/bup/bup-0.23a.ebuild index 7a23c36..b73be0d 100644 --- a/app-backup/bup/bup-0.23.ebuild +++ b/app-backup/bup/bup-0.23a.ebuild @@ -31,10 +31,6 @@ src_unpack() { mv -v * "${S}" || die } -src_prepare() { - epatch "${FILESDIR}"/*.patch -} - src_compile() { emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed" } diff --git a/app-backup/bup/files/p1.patch b/app-backup/bup/files/p1.patch deleted file mode 100644 index 3005498..0000000 --- a/app-backup/bup/files/p1.patch +++ /dev/null @@ -1,52 +0,0 @@ -The .c and .o rules were not used and were misleadingly implying that we -were already paying attention to LDFLAGS and CFLAGS. Instead apply the -flags to csetup.py where they will actually do something. - -Signed-off-by: Brandon Low <lostlogic@lostlogicx.com> ---- - Makefile | 10 ++-------- - 1 files changed, 2 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index d18e2ed..519ebe8 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - OS:=$(shell uname | sed 's/[-_].*//') --CFLAGS=-Wall -g -O2 -Werror $(PYINCLUDE) -g -+CFLAGS:=-Wall -g -O2 -Werror $(PYINCLUDE) -g - ifneq ($(OS),CYGWIN) - CFLAGS += -fPIC - endif -@@ -71,7 +71,7 @@ install: all - lib/bup/_helpers$(SOEXT): \ - lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py - @rm -f $@ -- cd lib/bup && $(PYTHON) csetup.py build -+ cd lib/bup && LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" $(PYTHON) csetup.py build - cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/ - - .PHONY: lib/bup/_version.py -@@ -96,9 +96,6 @@ test: all - - check: test - --%: %.o -- $(CC) $(CFLAGS) (LDFLAGS) -o $@ $^ $(LIBS) -- - bup: main.py - rm -f $@ - ln -s $< $@ -@@ -123,9 +120,6 @@ cmd/bup-%: cmd/%-cmd.sh - rm -f $@ - ln -s $*-cmd.sh $@ - --%.o: %.c -- gcc -c -o $@ $< $(CPPFLAGS) $(CFLAGS) -- - # update the local 'man' and 'html' branches with pregenerated output files, for - # people who don't have pandoc (and maybe to aid in google searches or something) - export-docs: Documentation/all --- -1.7.1 - diff --git a/app-backup/bup/files/p2.patch b/app-backup/bup/files/p2.patch deleted file mode 100644 index ffdee66..0000000 --- a/app-backup/bup/files/p2.patch +++ /dev/null @@ -1,24 +0,0 @@ -And it's a good idea not to ignore fwrite's return value I suppose. - -Signed-off-by: Brandon Low <lostlogic@lostlogicx.com> ---- - lib/bup/_helpers.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/lib/bup/_helpers.c b/lib/bup/_helpers.c -index df104cf..594ff0f 100644 ---- a/lib/bup/_helpers.c -+++ b/lib/bup/_helpers.c -@@ -472,7 +472,8 @@ static PyObject *write_idx(PyObject *self, PyObject *args) - if (ofs > 0x7fffffff) - { - uint64_t nofs = htonll(ofs); -- fwrite(&nofs, 8, 1, f); -+ if (fwrite(&nofs, 8, 1, f) != 1) -+ return PyErr_SetFromErrno(PyExc_OSError); - ofs = 0x80000000 | ofs64_count++; - } - *ofs_ptr++ = htonl((uint32_t)ofs); --- -1.7.1 - |