* [ptxdist] [PATCH 1/4] libkmod: version bump 13 -> 16
@ 2014-01-13 18:38 Robert Schwebel
2014-01-13 18:38 ` [ptxdist] [PATCH 2/4] e2fsprogs: version bump 1.42.7 -> 1.42.9 Robert Schwebel
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Robert Schwebel @ 2014-01-13 18:38 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
The patch applied to kmod-13 is upstream meanwhile, so we remove it.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...ssing-Don-t-call-syscall-with-syscallno-1.patch | 40 ----------------------
patches/kmod-13/series | 4 ---
rules/libkmod.make | 4 +--
3 files changed, 2 insertions(+), 46 deletions(-)
delete mode 100644 patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch
delete mode 100644 patches/kmod-13/series
diff --git a/patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch b/patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch
deleted file mode 100644
index a385d63..0000000
--- a/patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Lucas De Marchi <lucas.de.marchi@gmail.com>
-Date: Thu, 2 May 2013 13:22:57 -0300
-Subject: [PATCH] missing: Don't call syscall() with syscallno == -1
-
-Reported-by: Jean-Francis Roy <jeanfrancis@funtoo.org>
-Reported-by: Jan Luebbe <jlu@pengutronix.de>
----
- libkmod/missing.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/libkmod/missing.h b/libkmod/missing.h
-index edb88b9..b31af84 100644
---- a/libkmod/missing.h
-+++ b/libkmod/missing.h
-@@ -1,5 +1,6 @@
- #pragma once
-
-+#include <errno.h>
- #include <unistd.h>
- #include <sys/syscall.h>
-
-@@ -15,13 +16,14 @@
- # define MODULE_INIT_IGNORE_VERMAGIC 2
- #endif
-
--#ifndef __NR_finit_module
--# define __NR_finit_module -1
--#endif
--
- #ifndef HAVE_FINIT_MODULE
- static inline int finit_module(int fd, const char *uargs, int flags)
- {
-+#ifndef __NR_finit_module
-+ errno = ENOSYS;
-+ return -1;
-+#else
- return syscall(__NR_finit_module, fd, uargs, flags);
-+#endif
- }
- #endif
diff --git a/patches/kmod-13/series b/patches/kmod-13/series
deleted file mode 100644
index 3fc301f..0000000
--- a/patches/kmod-13/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-missing-Don-t-call-syscall-with-syscallno-1.patch
-# 0b7413dd7632441bc24225859a7d1866 - git-ptx-patches magic
diff --git a/rules/libkmod.make b/rules/libkmod.make
index 4595b68..761c5df 100644
--- a/rules/libkmod.make
+++ b/rules/libkmod.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBKMOD) += libkmod
#
# Paths and names
#
-LIBKMOD_VERSION := 13
-LIBKMOD_MD5 := d5aba43b9370cd52f3cb35e82a1aa595
+LIBKMOD_VERSION := 16
+LIBKMOD_MD5 := 3006a0287211212501cdfe1211b29f09
LIBKMOD := kmod-$(LIBKMOD_VERSION)
LIBKMOD_SUFFIX := tar.xz
LIBKMOD_URL := $(call ptx/mirror, KERNEL, utils/kernel/kmod/$(LIBKMOD).$(LIBKMOD_SUFFIX))
--
1.8.5.2
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH 2/4] e2fsprogs: version bump 1.42.7 -> 1.42.9
2014-01-13 18:38 [ptxdist] [PATCH 1/4] libkmod: version bump 13 -> 16 Robert Schwebel
@ 2014-01-13 18:38 ` Robert Schwebel
2014-01-13 18:38 ` [ptxdist] [PATCH 3/4] attr: version bump 2.4.46 -> 2.4.47 Robert Schwebel
2014-01-13 18:38 ` [ptxdist] [PATCH 4/4] bzip2: version bump 1.0.5 -> 1.0.6 Robert Schwebel
2 siblings, 0 replies; 7+ messages in thread
From: Robert Schwebel @ 2014-01-13 18:38 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
No patches need to be ported, but there is one new option upstream.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
rules/e2fsprogs.make | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 4ab562c..261d060 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
#
# Paths and names
#
-E2FSPROGS_VERSION := 1.42.7
-E2FSPROGS_MD5 := a1ec22ef003688dae9f76c74881b22b9
+E2FSPROGS_VERSION := 1.42.9
+E2FSPROGS_MD5 := 3f8e41e63b432ba114b33f58674563f7
E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION)
E2FSPROGS_SUFFIX := tar.gz
E2FSPROGS_URL := $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
@@ -61,7 +61,8 @@ E2FSPROGS_CONF_OPT := \
--disable-uuidd \
--disable-nls \
--disable-rpath \
- --without-diet-libc
+ --without-diet-libc \
+ --disable-backtrace
E2FSPROGS_INSTALL_OPT := install
--
1.8.5.2
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH 3/4] attr: version bump 2.4.46 -> 2.4.47
2014-01-13 18:38 [ptxdist] [PATCH 1/4] libkmod: version bump 13 -> 16 Robert Schwebel
2014-01-13 18:38 ` [ptxdist] [PATCH 2/4] e2fsprogs: version bump 1.42.7 -> 1.42.9 Robert Schwebel
@ 2014-01-13 18:38 ` Robert Schwebel
2014-01-20 10:50 ` Juergen Beisert
2014-01-13 18:38 ` [ptxdist] [PATCH 4/4] bzip2: version bump 1.0.5 -> 1.0.6 Robert Schwebel
2 siblings, 1 reply; 7+ messages in thread
From: Robert Schwebel @ 2014-01-13 18:38 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
rules/attr.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/attr.make b/rules/attr.make
index 844ab74..22e1a15 100644
--- a/rules/attr.make
+++ b/rules/attr.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_ATTR) += attr
#
# Paths and names
#
-ATTR_VERSION := 2.4.46
-ATTR_MD5 := db557c17fdfa4f785333ecda08654010
+ATTR_VERSION := 2.4.47
+ATTR_MD5 := 84f58dec00b60f2dc8fd1c9709291cc7
ATTR := attr-$(ATTR_VERSION)
ATTR_SUFFIX := tar.gz
ATTR_SOURCE := $(SRCDIR)/$(ATTR).src.$(ATTR_SUFFIX)
--
1.8.5.2
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH 4/4] bzip2: version bump 1.0.5 -> 1.0.6
2014-01-13 18:38 [ptxdist] [PATCH 1/4] libkmod: version bump 13 -> 16 Robert Schwebel
2014-01-13 18:38 ` [ptxdist] [PATCH 2/4] e2fsprogs: version bump 1.42.7 -> 1.42.9 Robert Schwebel
2014-01-13 18:38 ` [ptxdist] [PATCH 3/4] attr: version bump 2.4.46 -> 2.4.47 Robert Schwebel
@ 2014-01-13 18:38 ` Robert Schwebel
2014-01-23 16:50 ` Michael Olbrich
2 siblings, 1 reply; 7+ messages in thread
From: Robert Schwebel @ 2014-01-13 18:38 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
This new version fixes a security issue: CVE-2010-0405.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
patches/bzip2-1.0.5/0001-fixup-Makefile.patch | 207 --------------------------
patches/bzip2-1.0.5/series | 4 -
patches/bzip2-1.0.6/0001-fixup-Makefile.patch | 207 ++++++++++++++++++++++++++
patches/bzip2-1.0.6/series | 4 +
rules/bzip2.make | 6 +-
5 files changed, 214 insertions(+), 214 deletions(-)
delete mode 100644 patches/bzip2-1.0.5/0001-fixup-Makefile.patch
delete mode 100644 patches/bzip2-1.0.5/series
create mode 100644 patches/bzip2-1.0.6/0001-fixup-Makefile.patch
create mode 100644 patches/bzip2-1.0.6/series
diff --git a/patches/bzip2-1.0.5/0001-fixup-Makefile.patch b/patches/bzip2-1.0.5/0001-fixup-Makefile.patch
deleted file mode 100644
index 85d4fb4..0000000
--- a/patches/bzip2-1.0.5/0001-fixup-Makefile.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Sat, 29 Oct 2011 18:59:40 +0200
-Subject: [PATCH] fixup Makefile
-
-This patch fixes various problems in the makefile and disables compile
-time test. It was taken from Debinan.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
-# 20091210 rsc: needs probably another look before going mainline
-
- Makefile | 134 ++++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 69 insertions(+), 65 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index eb09753..8b1bf77 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,6 +12,8 @@
- # in the file LICENSE.
- # ------------------------------------------------------------------
-
-+somajor=1.0
-+sominor=$(somajor).4
- SHELL=/bin/sh
-
- # To assist in cross-compiling
-@@ -21,7 +23,7 @@ RANLIB=ranlib
- LDFLAGS=
-
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) $(DEBCFLAGS)
-
- # Where you want it installed when you do 'make install'
- PREFIX=/usr/local
-@@ -35,9 +37,9 @@ OBJS= blocksort.o \
- decompress.o \
- bzlib.o
-
--all: libbz2.a bzip2 bzip2recover test
-+all: libbz2.a bzip2 bzip2recover # test
-
--bzip2: libbz2.a bzip2.o
-+bzip2: libbz2.so bzip2.o
- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
-
- bzip2recover: bzip2recover.o
-@@ -46,20 +48,42 @@ bzip2recover: bzip2recover.o
- libbz2.a: $(OBJS)
- rm -f libbz2.a
- $(AR) cq libbz2.a $(OBJS)
-- @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
-- -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
-+ @if ( test -f $(RANLIB) || test -f /usr/bin/ranlib || \
-+ test -f /bin/ranlib || test -f /usr/ccs/bin/ranlib ) ; then \
- echo $(RANLIB) libbz2.a ; \
- $(RANLIB) libbz2.a ; \
- fi
-
-+libbz2.so: libbz2.so.$(somajor)
-+ ln -sf $^ $@
-+
-+libbz2.so.$(somajor): libbz2.so.$(sominor)
-+ ln -sf $^ $@
-+
-+libbz2.so.$(sominor): $(OBJS:%.o=%.sho)
-+ $(CC) -o libbz2.so.$(sominor) -shared \
-+ -Wl,-soname,libbz2.so.$(somajor) $^ -lc
-+
-+%.sho: %.c
-+ $(CC) $(CFLAGS) -D_REENTRANT -fPIC -o $@ -c $<
-+
-+%.o: %.c
-+ $(CC) $(CFLAGS) -D_REENTRANT -o $@ -c $<
-+
- check: test
- test: bzip2
- @cat words1
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -1 < sample1.ref > sample1.rb2
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -2 < sample2.ref > sample2.rb2
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -3 < sample3.ref > sample3.rb2
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -d < sample1.bz2 > sample1.tst
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -d < sample2.bz2 > sample2.tst
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -ds < sample3.bz2 > sample3.tst
- cmp sample1.bz2 sample1.rb2
- cmp sample2.bz2 sample2.rb2
-@@ -69,73 +93,53 @@ test: bzip2
- cmp sample3.tst sample3.ref
- @cat words3
-
--install: bzip2 bzip2recover
-- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
-- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
-- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
-- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
-- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
-- cp -f bzip2 $(PREFIX)/bin/bzip2
-- cp -f bzip2 $(PREFIX)/bin/bunzip2
-- cp -f bzip2 $(PREFIX)/bin/bzcat
-- cp -f bzip2recover $(PREFIX)/bin/bzip2recover
-- chmod a+x $(PREFIX)/bin/bzip2
-- chmod a+x $(PREFIX)/bin/bunzip2
-- chmod a+x $(PREFIX)/bin/bzcat
-- chmod a+x $(PREFIX)/bin/bzip2recover
-- cp -f bzip2.1 $(PREFIX)/man/man1
-- chmod a+r $(PREFIX)/man/man1/bzip2.1
-- cp -f bzlib.h $(PREFIX)/include
-- chmod a+r $(PREFIX)/include/bzlib.h
-- cp -f libbz2.a $(PREFIX)/lib
-- chmod a+r $(PREFIX)/lib/libbz2.a
-- cp -f bzgrep $(PREFIX)/bin/bzgrep
-- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
-- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
-- chmod a+x $(PREFIX)/bin/bzgrep
-- cp -f bzmore $(PREFIX)/bin/bzmore
-- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
-- chmod a+x $(PREFIX)/bin/bzmore
-- cp -f bzdiff $(PREFIX)/bin/bzdiff
-- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
-- chmod a+x $(PREFIX)/bin/bzdiff
-- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
-- chmod a+r $(PREFIX)/man/man1/bzgrep.1
-- chmod a+r $(PREFIX)/man/man1/bzmore.1
-- chmod a+r $(PREFIX)/man/man1/bzdiff.1
-- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
-- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
-- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
-- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-+install: bzip2 bzip2recover libbz2.a
-+ if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
-+ if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
-+ if ( test ! -d $(DESTDIR)$(PREFIX)/man ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man ; fi
-+ if ( test ! -d $(DESTDIR)$(PREFIX)/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man/man1 ; fi
-+ if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
-+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
-+ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
-+ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
-+ cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+ cp -f bzip2.1 $(DESTDIR)$(PREFIX)/man/man1
-+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzip2.1
-+ cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
-+ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
-+ cp -fa libbz2.a libbz2.so* $(DESTDIR)$(PREFIX)/lib
-+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
-+ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
-+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
-+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
-+ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
-+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
-+ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
-+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
-+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/man/man1
-+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzgrep.1
-+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzmore.1
-+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzdiff.1
-+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzegrep.1
-+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzfgrep.1
-+ echo ".so man1/bzmore.1" > $(DESTDIR)$(PREFIX)/man/man1/bzless.1
-+ echo ".so man1/bzdiff.1" > $(DESTDIR)$(PREFIX)/man/man1/bzcmp.1
-
- clean:
-- rm -f *.o libbz2.a bzip2 bzip2recover \
-+ rm -f *.o *.sho libbz2.a libbz2.so* bzip2 bzip2recover \
- sample1.rb2 sample2.rb2 sample3.rb2 \
- sample1.tst sample2.tst sample3.tst
-
--blocksort.o: blocksort.c
-- @cat words0
-- $(CC) $(CFLAGS) -c blocksort.c
--huffman.o: huffman.c
-- $(CC) $(CFLAGS) -c huffman.c
--crctable.o: crctable.c
-- $(CC) $(CFLAGS) -c crctable.c
--randtable.o: randtable.c
-- $(CC) $(CFLAGS) -c randtable.c
--compress.o: compress.c
-- $(CC) $(CFLAGS) -c compress.c
--decompress.o: decompress.c
-- $(CC) $(CFLAGS) -c decompress.c
--bzlib.o: bzlib.c
-- $(CC) $(CFLAGS) -c bzlib.c
--bzip2.o: bzip2.c
-- $(CC) $(CFLAGS) -c bzip2.c
--bzip2recover.o: bzip2recover.c
-- $(CC) $(CFLAGS) -c bzip2recover.c
--
-
- distclean: clean
-- rm -f manual.ps manual.html manual.pdf
-+ #rm -f manual.ps manual.html manual.pdf
-
- DISTNAME=bzip2-1.0.5
- dist: check manual
diff --git a/patches/bzip2-1.0.5/series b/patches/bzip2-1.0.5/series
deleted file mode 100644
index 78ff345..0000000
--- a/patches/bzip2-1.0.5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-fixup-Makefile.patch
-# cf8c416b9e8252c5e89375edfd4523b9 - git-ptx-patches magic
diff --git a/patches/bzip2-1.0.6/0001-fixup-Makefile.patch b/patches/bzip2-1.0.6/0001-fixup-Makefile.patch
new file mode 100644
index 0000000..85d4fb4
--- /dev/null
+++ b/patches/bzip2-1.0.6/0001-fixup-Makefile.patch
@@ -0,0 +1,207 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:59:40 +0200
+Subject: [PATCH] fixup Makefile
+
+This patch fixes various problems in the makefile and disables compile
+time test. It was taken from Debinan.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+# 20091210 rsc: needs probably another look before going mainline
+
+ Makefile | 134 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 69 insertions(+), 65 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index eb09753..8b1bf77 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,6 +12,8 @@
+ # in the file LICENSE.
+ # ------------------------------------------------------------------
+
++somajor=1.0
++sominor=$(somajor).4
+ SHELL=/bin/sh
+
+ # To assist in cross-compiling
+@@ -21,7 +23,7 @@ RANLIB=ranlib
+ LDFLAGS=
+
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) $(DEBCFLAGS)
+
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+@@ -35,9 +37,9 @@ OBJS= blocksort.o \
+ decompress.o \
+ bzlib.o
+
+-all: libbz2.a bzip2 bzip2recover test
++all: libbz2.a bzip2 bzip2recover # test
+
+-bzip2: libbz2.a bzip2.o
++bzip2: libbz2.so bzip2.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
+
+ bzip2recover: bzip2recover.o
+@@ -46,20 +48,42 @@ bzip2recover: bzip2recover.o
+ libbz2.a: $(OBJS)
+ rm -f libbz2.a
+ $(AR) cq libbz2.a $(OBJS)
+- @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
+- -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
++ @if ( test -f $(RANLIB) || test -f /usr/bin/ranlib || \
++ test -f /bin/ranlib || test -f /usr/ccs/bin/ranlib ) ; then \
+ echo $(RANLIB) libbz2.a ; \
+ $(RANLIB) libbz2.a ; \
+ fi
+
++libbz2.so: libbz2.so.$(somajor)
++ ln -sf $^ $@
++
++libbz2.so.$(somajor): libbz2.so.$(sominor)
++ ln -sf $^ $@
++
++libbz2.so.$(sominor): $(OBJS:%.o=%.sho)
++ $(CC) -o libbz2.so.$(sominor) -shared \
++ -Wl,-soname,libbz2.so.$(somajor) $^ -lc
++
++%.sho: %.c
++ $(CC) $(CFLAGS) -D_REENTRANT -fPIC -o $@ -c $<
++
++%.o: %.c
++ $(CC) $(CFLAGS) -D_REENTRANT -o $@ -c $<
++
+ check: test
+ test: bzip2
+ @cat words1
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -1 < sample1.ref > sample1.rb2
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -2 < sample2.ref > sample2.rb2
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -3 < sample3.ref > sample3.rb2
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -d < sample1.bz2 > sample1.tst
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -d < sample2.bz2 > sample2.tst
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -ds < sample3.bz2 > sample3.tst
+ cmp sample1.bz2 sample1.rb2
+ cmp sample2.bz2 sample2.rb2
+@@ -69,73 +93,53 @@ test: bzip2
+ cmp sample3.tst sample3.ref
+ @cat words3
+
+-install: bzip2 bzip2recover
+- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
+- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
+- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
+- cp -f bzip2 $(PREFIX)/bin/bzip2
+- cp -f bzip2 $(PREFIX)/bin/bunzip2
+- cp -f bzip2 $(PREFIX)/bin/bzcat
+- cp -f bzip2recover $(PREFIX)/bin/bzip2recover
+- chmod a+x $(PREFIX)/bin/bzip2
+- chmod a+x $(PREFIX)/bin/bunzip2
+- chmod a+x $(PREFIX)/bin/bzcat
+- chmod a+x $(PREFIX)/bin/bzip2recover
+- cp -f bzip2.1 $(PREFIX)/man/man1
+- chmod a+r $(PREFIX)/man/man1/bzip2.1
+- cp -f bzlib.h $(PREFIX)/include
+- chmod a+r $(PREFIX)/include/bzlib.h
+- cp -f libbz2.a $(PREFIX)/lib
+- chmod a+r $(PREFIX)/lib/libbz2.a
+- cp -f bzgrep $(PREFIX)/bin/bzgrep
+- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+- chmod a+x $(PREFIX)/bin/bzgrep
+- cp -f bzmore $(PREFIX)/bin/bzmore
+- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+- chmod a+x $(PREFIX)/bin/bzmore
+- cp -f bzdiff $(PREFIX)/bin/bzdiff
+- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+- chmod a+x $(PREFIX)/bin/bzdiff
+- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
+- chmod a+r $(PREFIX)/man/man1/bzgrep.1
+- chmod a+r $(PREFIX)/man/man1/bzmore.1
+- chmod a+r $(PREFIX)/man/man1/bzdiff.1
+- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
+- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
+- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
+- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
++install: bzip2 bzip2recover libbz2.a
++ if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
++ if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
++ if ( test ! -d $(DESTDIR)$(PREFIX)/man ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man ; fi
++ if ( test ! -d $(DESTDIR)$(PREFIX)/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man/man1 ; fi
++ if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
++ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
++ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
++ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
++ cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
++ cp -f bzip2.1 $(DESTDIR)$(PREFIX)/man/man1
++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzip2.1
++ cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
++ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
++ cp -fa libbz2.a libbz2.so* $(DESTDIR)$(PREFIX)/lib
++ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
++ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
++ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
++ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
++ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/man/man1
++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzgrep.1
++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzmore.1
++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzdiff.1
++ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzegrep.1
++ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzfgrep.1
++ echo ".so man1/bzmore.1" > $(DESTDIR)$(PREFIX)/man/man1/bzless.1
++ echo ".so man1/bzdiff.1" > $(DESTDIR)$(PREFIX)/man/man1/bzcmp.1
+
+ clean:
+- rm -f *.o libbz2.a bzip2 bzip2recover \
++ rm -f *.o *.sho libbz2.a libbz2.so* bzip2 bzip2recover \
+ sample1.rb2 sample2.rb2 sample3.rb2 \
+ sample1.tst sample2.tst sample3.tst
+
+-blocksort.o: blocksort.c
+- @cat words0
+- $(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+- $(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+- $(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+- $(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+- $(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+- $(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+- $(CC) $(CFLAGS) -c bzlib.c
+-bzip2.o: bzip2.c
+- $(CC) $(CFLAGS) -c bzip2.c
+-bzip2recover.o: bzip2recover.c
+- $(CC) $(CFLAGS) -c bzip2recover.c
+-
+
+ distclean: clean
+- rm -f manual.ps manual.html manual.pdf
++ #rm -f manual.ps manual.html manual.pdf
+
+ DISTNAME=bzip2-1.0.5
+ dist: check manual
diff --git a/patches/bzip2-1.0.6/series b/patches/bzip2-1.0.6/series
new file mode 100644
index 0000000..78ff345
--- /dev/null
+++ b/patches/bzip2-1.0.6/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fixup-Makefile.patch
+# cf8c416b9e8252c5e89375edfd4523b9 - git-ptx-patches magic
diff --git a/rules/bzip2.make b/rules/bzip2.make
index 925b08d..64a742c 100644
--- a/rules/bzip2.make
+++ b/rules/bzip2.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_BZIP2) += bzip2
#
# Paths and names
#
-BZIP2_VERSION := 1.0.5
-BZIP2_MD5 := 3c15a0c8d1d3ee1c46a1634d00617b1a
+BZIP2_VERSION := 1.0.6
+BZIP2_MD5 := 00b516f4704d4a7cb50a1d97e6e8e15b
BZIP2 := bzip2-$(BZIP2_VERSION)
BZIP2_SUFFIX := tar.gz
-BZIP2_URL := http://www.bzip.org/1.0.5/$(BZIP2).$(BZIP2_SUFFIX)
+BZIP2_URL := http://www.bzip.org/$(BZIP2_VERSION)/$(BZIP2).$(BZIP2_SUFFIX)
BZIP2_SOURCE := $(SRCDIR)/$(BZIP2).$(BZIP2_SUFFIX)
BZIP2_DIR := $(BUILDDIR)/$(BZIP2)
--
1.8.5.2
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [PATCH 3/4] attr: version bump 2.4.46 -> 2.4.47
2014-01-13 18:38 ` [ptxdist] [PATCH 3/4] attr: version bump 2.4.46 -> 2.4.47 Robert Schwebel
@ 2014-01-20 10:50 ` Juergen Beisert
2014-01-21 6:54 ` [ptxdist] [PATCH] attr: re-add patches after version bump to 2.4.47 Robert Schwebel
0 siblings, 1 reply; 7+ messages in thread
From: Juergen Beisert @ 2014-01-20 10:50 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
On Monday 13 January 2014 19:38:30 Robert Schwebel wrote:
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
> rules/attr.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/attr.make b/rules/attr.make
> index 844ab74..22e1a15 100644
> --- a/rules/attr.make
> +++ b/rules/attr.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_ATTR) += attr
> #
> # Paths and names
> #
> -ATTR_VERSION := 2.4.46
> -ATTR_MD5 := db557c17fdfa4f785333ecda08654010
> +ATTR_VERSION := 2.4.47
> +ATTR_MD5 := 84f58dec00b60f2dc8fd1c9709291cc7
> ATTR := attr-$(ATTR_VERSION)
> ATTR_SUFFIX := tar.gz
> ATTR_SOURCE := $(SRCDIR)/$(ATTR).src.$(ATTR_SUFFIX)
You should remove the old patches for 2.4.46 as well.
jbe
--
Pengutronix e.K. | Juergen Beisert |
Linux Solutions for Science and Industry | http://www.pengutronix.de/ |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH] attr: re-add patches after version bump to 2.4.47
2014-01-20 10:50 ` Juergen Beisert
@ 2014-01-21 6:54 ` Robert Schwebel
0 siblings, 0 replies; 7+ messages in thread
From: Robert Schwebel @ 2014-01-21 6:54 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Commit 373f6ce6d37610380b539dfaa9292f9682a374c0 forgot to port the
patches forward.
The old patch "0001-buildmacros-use-correct-libtool-commands.patch" was
already applied upstream, so it could be removed.
0001-fix-install-with-domain-user.patch stays valid and is ported over.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...-buildmacros-use-correct-libtool-commands.patch | 42 ----------------------
.../0002-fix-install-with-domain-user.patch | 30 ----------------
patches/attr-2.4.46/series | 4 ---
.../0001-fix-install-with-domain-user.patch | 27 ++++++++++++++
patches/attr-2.4.47/series | 4 +++
5 files changed, 31 insertions(+), 76 deletions(-)
delete mode 100644 patches/attr-2.4.46/0001-buildmacros-use-correct-libtool-commands.patch
delete mode 100644 patches/attr-2.4.46/0002-fix-install-with-domain-user.patch
delete mode 100644 patches/attr-2.4.46/series
create mode 100644 patches/attr-2.4.47/0001-fix-install-with-domain-user.patch
create mode 100644 patches/attr-2.4.47/series
diff --git a/patches/attr-2.4.46/0001-buildmacros-use-correct-libtool-commands.patch b/patches/attr-2.4.46/0001-buildmacros-use-correct-libtool-commands.patch
deleted file mode 100644
index 9e263b7..0000000
--- a/patches/attr-2.4.46/0001-buildmacros-use-correct-libtool-commands.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Fri, 8 Jan 2010 17:22:45 +0100
-Subject: [PATCH] buildmacros: use correct libtool commands
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-[mkl: remove broken DESTDIR support]
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-[mol: install .la not .lai for static libs]
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- include/buildmacros | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/buildmacros b/include/buildmacros
-index ab89182..d9b0734 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -55,10 +55,10 @@ LIBNAME = $(basename $(LTLIBRARY))
- LTOBJECTS = $(OBJECTS:.o=.lo)
- LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
--LTLINK = $(LIBTOOL) --mode=link $(CC)
-+LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC)
- LTEXEC = $(LIBTOOL) --mode=execute
- LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF)
-
- ifeq ($(ENABLE_SHARED),yes)
- LTLDFLAGS += -rpath $(PKG_LIB_DIR)
-@@ -99,7 +99,7 @@ endif
- INSTALL_LTLIB_STATIC = \
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
-+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR)
-
- INSTALL_MAN = \
- @for d in $(MAN_PAGES); do \
---
-1.7.0.4
-
diff --git a/patches/attr-2.4.46/0002-fix-install-with-domain-user.patch b/patches/attr-2.4.46/0002-fix-install-with-domain-user.patch
deleted file mode 100644
index 7693f5b..0000000
--- a/patches/attr-2.4.46/0002-fix-install-with-domain-user.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Jon Ringle <jon@ringle.org>
-Date: Mon, 23 May 2011 09:27:46 -0400
-Subject: [PATCH] fix install with domain\user
-
-If current user is domain\user the \ gets interpreted as an escape char
-resulting in user not found.
-
-Enclose "$(PKG_USER)" and "$(PKG_GROUP)" in quotes to fix.
-
-Signed-off-by: Jon Ringle <jon@ringle.org>
----
- include/buildmacros | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/buildmacros b/include/buildmacros
-index d9b0734..1eb61df 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
- $(LFILES:.l=.o) \
- $(YFILES:%.y=%.tab.o)
-
--INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-+INSTALL = $(TOPDIR)/include/install-sh -o "$(PKG_USER)" -g "$(PKG_GROUP)"
-
- SHELL = /bin/sh
- IMAGES_DIR = $(TOPDIR)/all-images
---
-1.7.0.4
-
diff --git a/patches/attr-2.4.46/series b/patches/attr-2.4.46/series
deleted file mode 100644
index 08fedac..0000000
--- a/patches/attr-2.4.46/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-0001-buildmacros-use-correct-libtool-commands.patch
-0002-fix-install-with-domain-user.patch
-# 3ad7b27704d5f1e53da8022f1ac62c74 - git-ptx-patches magic
diff --git a/patches/attr-2.4.47/0001-fix-install-with-domain-user.patch b/patches/attr-2.4.47/0001-fix-install-with-domain-user.patch
new file mode 100644
index 0000000..893f766
--- /dev/null
+++ b/patches/attr-2.4.47/0001-fix-install-with-domain-user.patch
@@ -0,0 +1,27 @@
+From: Jon Ringle <jon@ringle.org>
+Date: Mon, 23 May 2011 09:27:46 -0400
+Subject: [PATCH] fix install with domain\user
+
+If current user is domain\user the \ gets interpreted as an escape char
+resulting in user not found.
+
+Enclose "$(PKG_USER)" and "$(PKG_GROUP)" in quotes to fix.
+
+Signed-off-by: Jon Ringle <jon@ringle.org>
+---
+ include/buildmacros | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/buildmacros b/include/buildmacros
+index 9e81bb8..939f39b 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
+ $(LFILES:.l=.o) \
+ $(YFILES:%.y=%.tab.o)
+
+-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL = $(TOPDIR)/include/install-sh -o "$(PKG_USER)" -g "$(PKG_GROUP)"
+
+ IMAGES_DIR = $(TOPDIR)/all-images
+ DIST_DIR = $(TOPDIR)/dist
diff --git a/patches/attr-2.4.47/series b/patches/attr-2.4.47/series
new file mode 100644
index 0000000..1233bd7
--- /dev/null
+++ b/patches/attr-2.4.47/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-install-with-domain-user.patch
+# ae36b8c004e9029248eefce58523c9d6 - git-ptx-patches magic
--
1.8.5.2
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [PATCH 4/4] bzip2: version bump 1.0.5 -> 1.0.6
2014-01-13 18:38 ` [ptxdist] [PATCH 4/4] bzip2: version bump 1.0.5 -> 1.0.6 Robert Schwebel
@ 2014-01-23 16:50 ` Michael Olbrich
0 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2014-01-23 16:50 UTC (permalink / raw)
To: ptxdist
On Mon, Jan 13, 2014 at 07:38:31PM +0100, Robert Schwebel wrote:
> This new version fixes a security issue: CVE-2010-0405.
Thanks, all applied.
Michael
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
> patches/bzip2-1.0.5/0001-fixup-Makefile.patch | 207 --------------------------
> patches/bzip2-1.0.5/series | 4 -
> patches/bzip2-1.0.6/0001-fixup-Makefile.patch | 207 ++++++++++++++++++++++++++
> patches/bzip2-1.0.6/series | 4 +
> rules/bzip2.make | 6 +-
> 5 files changed, 214 insertions(+), 214 deletions(-)
> delete mode 100644 patches/bzip2-1.0.5/0001-fixup-Makefile.patch
> delete mode 100644 patches/bzip2-1.0.5/series
> create mode 100644 patches/bzip2-1.0.6/0001-fixup-Makefile.patch
> create mode 100644 patches/bzip2-1.0.6/series
>
> diff --git a/patches/bzip2-1.0.5/0001-fixup-Makefile.patch b/patches/bzip2-1.0.5/0001-fixup-Makefile.patch
> deleted file mode 100644
> index 85d4fb4..0000000
> --- a/patches/bzip2-1.0.5/0001-fixup-Makefile.patch
> +++ /dev/null
> @@ -1,207 +0,0 @@
> -From: Marc Kleine-Budde <mkl@pengutronix.de>
> -Date: Sat, 29 Oct 2011 18:59:40 +0200
> -Subject: [PATCH] fixup Makefile
> -
> -This patch fixes various problems in the makefile and disables compile
> -time test. It was taken from Debinan.
> -
> -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ----
> -# 20091210 rsc: needs probably another look before going mainline
> -
> - Makefile | 134 ++++++++++++++++++++++++++++++++------------------------------
> - 1 files changed, 69 insertions(+), 65 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index eb09753..8b1bf77 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -12,6 +12,8 @@
> - # in the file LICENSE.
> - # ------------------------------------------------------------------
> -
> -+somajor=1.0
> -+sominor=$(somajor).4
> - SHELL=/bin/sh
> -
> - # To assist in cross-compiling
> -@@ -21,7 +23,7 @@ RANLIB=ranlib
> - LDFLAGS=
> -
> - BIGFILES=-D_FILE_OFFSET_BITS=64
> --CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
> -+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) $(DEBCFLAGS)
> -
> - # Where you want it installed when you do 'make install'
> - PREFIX=/usr/local
> -@@ -35,9 +37,9 @@ OBJS= blocksort.o \
> - decompress.o \
> - bzlib.o
> -
> --all: libbz2.a bzip2 bzip2recover test
> -+all: libbz2.a bzip2 bzip2recover # test
> -
> --bzip2: libbz2.a bzip2.o
> -+bzip2: libbz2.so bzip2.o
> - $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
> -
> - bzip2recover: bzip2recover.o
> -@@ -46,20 +48,42 @@ bzip2recover: bzip2recover.o
> - libbz2.a: $(OBJS)
> - rm -f libbz2.a
> - $(AR) cq libbz2.a $(OBJS)
> -- @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
> -- -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
> -+ @if ( test -f $(RANLIB) || test -f /usr/bin/ranlib || \
> -+ test -f /bin/ranlib || test -f /usr/ccs/bin/ranlib ) ; then \
> - echo $(RANLIB) libbz2.a ; \
> - $(RANLIB) libbz2.a ; \
> - fi
> -
> -+libbz2.so: libbz2.so.$(somajor)
> -+ ln -sf $^ $@
> -+
> -+libbz2.so.$(somajor): libbz2.so.$(sominor)
> -+ ln -sf $^ $@
> -+
> -+libbz2.so.$(sominor): $(OBJS:%.o=%.sho)
> -+ $(CC) -o libbz2.so.$(sominor) -shared \
> -+ -Wl,-soname,libbz2.so.$(somajor) $^ -lc
> -+
> -+%.sho: %.c
> -+ $(CC) $(CFLAGS) -D_REENTRANT -fPIC -o $@ -c $<
> -+
> -+%.o: %.c
> -+ $(CC) $(CFLAGS) -D_REENTRANT -o $@ -c $<
> -+
> - check: test
> - test: bzip2
> - @cat words1
> -+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> - ./bzip2 -1 < sample1.ref > sample1.rb2
> -+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> - ./bzip2 -2 < sample2.ref > sample2.rb2
> -+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> - ./bzip2 -3 < sample3.ref > sample3.rb2
> -+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> - ./bzip2 -d < sample1.bz2 > sample1.tst
> -+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> - ./bzip2 -d < sample2.bz2 > sample2.tst
> -+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> - ./bzip2 -ds < sample3.bz2 > sample3.tst
> - cmp sample1.bz2 sample1.rb2
> - cmp sample2.bz2 sample2.rb2
> -@@ -69,73 +93,53 @@ test: bzip2
> - cmp sample3.tst sample3.ref
> - @cat words3
> -
> --install: bzip2 bzip2recover
> -- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
> -- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
> -- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
> -- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
> -- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
> -- cp -f bzip2 $(PREFIX)/bin/bzip2
> -- cp -f bzip2 $(PREFIX)/bin/bunzip2
> -- cp -f bzip2 $(PREFIX)/bin/bzcat
> -- cp -f bzip2recover $(PREFIX)/bin/bzip2recover
> -- chmod a+x $(PREFIX)/bin/bzip2
> -- chmod a+x $(PREFIX)/bin/bunzip2
> -- chmod a+x $(PREFIX)/bin/bzcat
> -- chmod a+x $(PREFIX)/bin/bzip2recover
> -- cp -f bzip2.1 $(PREFIX)/man/man1
> -- chmod a+r $(PREFIX)/man/man1/bzip2.1
> -- cp -f bzlib.h $(PREFIX)/include
> -- chmod a+r $(PREFIX)/include/bzlib.h
> -- cp -f libbz2.a $(PREFIX)/lib
> -- chmod a+r $(PREFIX)/lib/libbz2.a
> -- cp -f bzgrep $(PREFIX)/bin/bzgrep
> -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
> -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
> -- chmod a+x $(PREFIX)/bin/bzgrep
> -- cp -f bzmore $(PREFIX)/bin/bzmore
> -- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
> -- chmod a+x $(PREFIX)/bin/bzmore
> -- cp -f bzdiff $(PREFIX)/bin/bzdiff
> -- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
> -- chmod a+x $(PREFIX)/bin/bzdiff
> -- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
> -- chmod a+r $(PREFIX)/man/man1/bzgrep.1
> -- chmod a+r $(PREFIX)/man/man1/bzmore.1
> -- chmod a+r $(PREFIX)/man/man1/bzdiff.1
> -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
> -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
> -- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
> -- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
> -+install: bzip2 bzip2recover libbz2.a
> -+ if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
> -+ if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
> -+ if ( test ! -d $(DESTDIR)$(PREFIX)/man ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man ; fi
> -+ if ( test ! -d $(DESTDIR)$(PREFIX)/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man/man1 ; fi
> -+ if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
> -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
> -+ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
> -+ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
> -+ cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
> -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
> -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
> -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
> -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
> -+ cp -f bzip2.1 $(DESTDIR)$(PREFIX)/man/man1
> -+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzip2.1
> -+ cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
> -+ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
> -+ cp -fa libbz2.a libbz2.so* $(DESTDIR)$(PREFIX)/lib
> -+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
> -+ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
> -+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
> -+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
> -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
> -+ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
> -+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
> -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
> -+ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
> -+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
> -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
> -+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/man/man1
> -+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzgrep.1
> -+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzmore.1
> -+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzdiff.1
> -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzegrep.1
> -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzfgrep.1
> -+ echo ".so man1/bzmore.1" > $(DESTDIR)$(PREFIX)/man/man1/bzless.1
> -+ echo ".so man1/bzdiff.1" > $(DESTDIR)$(PREFIX)/man/man1/bzcmp.1
> -
> - clean:
> -- rm -f *.o libbz2.a bzip2 bzip2recover \
> -+ rm -f *.o *.sho libbz2.a libbz2.so* bzip2 bzip2recover \
> - sample1.rb2 sample2.rb2 sample3.rb2 \
> - sample1.tst sample2.tst sample3.tst
> -
> --blocksort.o: blocksort.c
> -- @cat words0
> -- $(CC) $(CFLAGS) -c blocksort.c
> --huffman.o: huffman.c
> -- $(CC) $(CFLAGS) -c huffman.c
> --crctable.o: crctable.c
> -- $(CC) $(CFLAGS) -c crctable.c
> --randtable.o: randtable.c
> -- $(CC) $(CFLAGS) -c randtable.c
> --compress.o: compress.c
> -- $(CC) $(CFLAGS) -c compress.c
> --decompress.o: decompress.c
> -- $(CC) $(CFLAGS) -c decompress.c
> --bzlib.o: bzlib.c
> -- $(CC) $(CFLAGS) -c bzlib.c
> --bzip2.o: bzip2.c
> -- $(CC) $(CFLAGS) -c bzip2.c
> --bzip2recover.o: bzip2recover.c
> -- $(CC) $(CFLAGS) -c bzip2recover.c
> --
> -
> - distclean: clean
> -- rm -f manual.ps manual.html manual.pdf
> -+ #rm -f manual.ps manual.html manual.pdf
> -
> - DISTNAME=bzip2-1.0.5
> - dist: check manual
> diff --git a/patches/bzip2-1.0.5/series b/patches/bzip2-1.0.5/series
> deleted file mode 100644
> index 78ff345..0000000
> --- a/patches/bzip2-1.0.5/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-fixup-Makefile.patch
> -# cf8c416b9e8252c5e89375edfd4523b9 - git-ptx-patches magic
> diff --git a/patches/bzip2-1.0.6/0001-fixup-Makefile.patch b/patches/bzip2-1.0.6/0001-fixup-Makefile.patch
> new file mode 100644
> index 0000000..85d4fb4
> --- /dev/null
> +++ b/patches/bzip2-1.0.6/0001-fixup-Makefile.patch
> @@ -0,0 +1,207 @@
> +From: Marc Kleine-Budde <mkl@pengutronix.de>
> +Date: Sat, 29 Oct 2011 18:59:40 +0200
> +Subject: [PATCH] fixup Makefile
> +
> +This patch fixes various problems in the makefile and disables compile
> +time test. It was taken from Debinan.
> +
> +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> +---
> +# 20091210 rsc: needs probably another look before going mainline
> +
> + Makefile | 134 ++++++++++++++++++++++++++++++++------------------------------
> + 1 files changed, 69 insertions(+), 65 deletions(-)
> +
> +diff --git a/Makefile b/Makefile
> +index eb09753..8b1bf77 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -12,6 +12,8 @@
> + # in the file LICENSE.
> + # ------------------------------------------------------------------
> +
> ++somajor=1.0
> ++sominor=$(somajor).4
> + SHELL=/bin/sh
> +
> + # To assist in cross-compiling
> +@@ -21,7 +23,7 @@ RANLIB=ranlib
> + LDFLAGS=
> +
> + BIGFILES=-D_FILE_OFFSET_BITS=64
> +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
> ++CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) $(DEBCFLAGS)
> +
> + # Where you want it installed when you do 'make install'
> + PREFIX=/usr/local
> +@@ -35,9 +37,9 @@ OBJS= blocksort.o \
> + decompress.o \
> + bzlib.o
> +
> +-all: libbz2.a bzip2 bzip2recover test
> ++all: libbz2.a bzip2 bzip2recover # test
> +
> +-bzip2: libbz2.a bzip2.o
> ++bzip2: libbz2.so bzip2.o
> + $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
> +
> + bzip2recover: bzip2recover.o
> +@@ -46,20 +48,42 @@ bzip2recover: bzip2recover.o
> + libbz2.a: $(OBJS)
> + rm -f libbz2.a
> + $(AR) cq libbz2.a $(OBJS)
> +- @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
> +- -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
> ++ @if ( test -f $(RANLIB) || test -f /usr/bin/ranlib || \
> ++ test -f /bin/ranlib || test -f /usr/ccs/bin/ranlib ) ; then \
> + echo $(RANLIB) libbz2.a ; \
> + $(RANLIB) libbz2.a ; \
> + fi
> +
> ++libbz2.so: libbz2.so.$(somajor)
> ++ ln -sf $^ $@
> ++
> ++libbz2.so.$(somajor): libbz2.so.$(sominor)
> ++ ln -sf $^ $@
> ++
> ++libbz2.so.$(sominor): $(OBJS:%.o=%.sho)
> ++ $(CC) -o libbz2.so.$(sominor) -shared \
> ++ -Wl,-soname,libbz2.so.$(somajor) $^ -lc
> ++
> ++%.sho: %.c
> ++ $(CC) $(CFLAGS) -D_REENTRANT -fPIC -o $@ -c $<
> ++
> ++%.o: %.c
> ++ $(CC) $(CFLAGS) -D_REENTRANT -o $@ -c $<
> ++
> + check: test
> + test: bzip2
> + @cat words1
> ++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> + ./bzip2 -1 < sample1.ref > sample1.rb2
> ++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> + ./bzip2 -2 < sample2.ref > sample2.rb2
> ++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> + ./bzip2 -3 < sample3.ref > sample3.rb2
> ++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> + ./bzip2 -d < sample1.bz2 > sample1.tst
> ++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> + ./bzip2 -d < sample2.bz2 > sample2.tst
> ++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
> + ./bzip2 -ds < sample3.bz2 > sample3.tst
> + cmp sample1.bz2 sample1.rb2
> + cmp sample2.bz2 sample2.rb2
> +@@ -69,73 +93,53 @@ test: bzip2
> + cmp sample3.tst sample3.ref
> + @cat words3
> +
> +-install: bzip2 bzip2recover
> +- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
> +- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
> +- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
> +- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
> +- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
> +- cp -f bzip2 $(PREFIX)/bin/bzip2
> +- cp -f bzip2 $(PREFIX)/bin/bunzip2
> +- cp -f bzip2 $(PREFIX)/bin/bzcat
> +- cp -f bzip2recover $(PREFIX)/bin/bzip2recover
> +- chmod a+x $(PREFIX)/bin/bzip2
> +- chmod a+x $(PREFIX)/bin/bunzip2
> +- chmod a+x $(PREFIX)/bin/bzcat
> +- chmod a+x $(PREFIX)/bin/bzip2recover
> +- cp -f bzip2.1 $(PREFIX)/man/man1
> +- chmod a+r $(PREFIX)/man/man1/bzip2.1
> +- cp -f bzlib.h $(PREFIX)/include
> +- chmod a+r $(PREFIX)/include/bzlib.h
> +- cp -f libbz2.a $(PREFIX)/lib
> +- chmod a+r $(PREFIX)/lib/libbz2.a
> +- cp -f bzgrep $(PREFIX)/bin/bzgrep
> +- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
> +- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
> +- chmod a+x $(PREFIX)/bin/bzgrep
> +- cp -f bzmore $(PREFIX)/bin/bzmore
> +- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
> +- chmod a+x $(PREFIX)/bin/bzmore
> +- cp -f bzdiff $(PREFIX)/bin/bzdiff
> +- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
> +- chmod a+x $(PREFIX)/bin/bzdiff
> +- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
> +- chmod a+r $(PREFIX)/man/man1/bzgrep.1
> +- chmod a+r $(PREFIX)/man/man1/bzmore.1
> +- chmod a+r $(PREFIX)/man/man1/bzdiff.1
> +- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
> +- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
> +- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
> +- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
> ++install: bzip2 bzip2recover libbz2.a
> ++ if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
> ++ if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
> ++ if ( test ! -d $(DESTDIR)$(PREFIX)/man ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man ; fi
> ++ if ( test ! -d $(DESTDIR)$(PREFIX)/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man/man1 ; fi
> ++ if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
> ++ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
> ++ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
> ++ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
> ++ cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
> ++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
> ++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
> ++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
> ++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
> ++ cp -f bzip2.1 $(DESTDIR)$(PREFIX)/man/man1
> ++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzip2.1
> ++ cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
> ++ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
> ++ cp -fa libbz2.a libbz2.so* $(DESTDIR)$(PREFIX)/lib
> ++ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
> ++ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
> ++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
> ++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
> ++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
> ++ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
> ++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
> ++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
> ++ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
> ++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
> ++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
> ++ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/man/man1
> ++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzgrep.1
> ++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzmore.1
> ++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzdiff.1
> ++ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzegrep.1
> ++ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzfgrep.1
> ++ echo ".so man1/bzmore.1" > $(DESTDIR)$(PREFIX)/man/man1/bzless.1
> ++ echo ".so man1/bzdiff.1" > $(DESTDIR)$(PREFIX)/man/man1/bzcmp.1
> +
> + clean:
> +- rm -f *.o libbz2.a bzip2 bzip2recover \
> ++ rm -f *.o *.sho libbz2.a libbz2.so* bzip2 bzip2recover \
> + sample1.rb2 sample2.rb2 sample3.rb2 \
> + sample1.tst sample2.tst sample3.tst
> +
> +-blocksort.o: blocksort.c
> +- @cat words0
> +- $(CC) $(CFLAGS) -c blocksort.c
> +-huffman.o: huffman.c
> +- $(CC) $(CFLAGS) -c huffman.c
> +-crctable.o: crctable.c
> +- $(CC) $(CFLAGS) -c crctable.c
> +-randtable.o: randtable.c
> +- $(CC) $(CFLAGS) -c randtable.c
> +-compress.o: compress.c
> +- $(CC) $(CFLAGS) -c compress.c
> +-decompress.o: decompress.c
> +- $(CC) $(CFLAGS) -c decompress.c
> +-bzlib.o: bzlib.c
> +- $(CC) $(CFLAGS) -c bzlib.c
> +-bzip2.o: bzip2.c
> +- $(CC) $(CFLAGS) -c bzip2.c
> +-bzip2recover.o: bzip2recover.c
> +- $(CC) $(CFLAGS) -c bzip2recover.c
> +-
> +
> + distclean: clean
> +- rm -f manual.ps manual.html manual.pdf
> ++ #rm -f manual.ps manual.html manual.pdf
> +
> + DISTNAME=bzip2-1.0.5
> + dist: check manual
> diff --git a/patches/bzip2-1.0.6/series b/patches/bzip2-1.0.6/series
> new file mode 100644
> index 0000000..78ff345
> --- /dev/null
> +++ b/patches/bzip2-1.0.6/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-fixup-Makefile.patch
> +# cf8c416b9e8252c5e89375edfd4523b9 - git-ptx-patches magic
> diff --git a/rules/bzip2.make b/rules/bzip2.make
> index 925b08d..64a742c 100644
> --- a/rules/bzip2.make
> +++ b/rules/bzip2.make
> @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_BZIP2) += bzip2
> #
> # Paths and names
> #
> -BZIP2_VERSION := 1.0.5
> -BZIP2_MD5 := 3c15a0c8d1d3ee1c46a1634d00617b1a
> +BZIP2_VERSION := 1.0.6
> +BZIP2_MD5 := 00b516f4704d4a7cb50a1d97e6e8e15b
> BZIP2 := bzip2-$(BZIP2_VERSION)
> BZIP2_SUFFIX := tar.gz
> -BZIP2_URL := http://www.bzip.org/1.0.5/$(BZIP2).$(BZIP2_SUFFIX)
> +BZIP2_URL := http://www.bzip.org/$(BZIP2_VERSION)/$(BZIP2).$(BZIP2_SUFFIX)
> BZIP2_SOURCE := $(SRCDIR)/$(BZIP2).$(BZIP2_SUFFIX)
> BZIP2_DIR := $(BUILDDIR)/$(BZIP2)
>
> --
> 1.8.5.2
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-01-23 16:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-13 18:38 [ptxdist] [PATCH 1/4] libkmod: version bump 13 -> 16 Robert Schwebel
2014-01-13 18:38 ` [ptxdist] [PATCH 2/4] e2fsprogs: version bump 1.42.7 -> 1.42.9 Robert Schwebel
2014-01-13 18:38 ` [ptxdist] [PATCH 3/4] attr: version bump 2.4.46 -> 2.4.47 Robert Schwebel
2014-01-20 10:50 ` Juergen Beisert
2014-01-21 6:54 ` [ptxdist] [PATCH] attr: re-add patches after version bump to 2.4.47 Robert Schwebel
2014-01-13 18:38 ` [ptxdist] [PATCH 4/4] bzip2: version bump 1.0.5 -> 1.0.6 Robert Schwebel
2014-01-23 16:50 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox