[gentoo-commits] proj/rpm2targz:master commit in: /

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     a9f55f411d42fc5f60c099d7d9bc432f0be3852d
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu May 17 04:43:06 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu May 17 04:44:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/rpm2targz.git;a=commit;h=a9f55f41

rpmoffset: provide a local memmem for non-glibc systems

URL: https://bugs.gentoo.org/397835
Reported-by: Christoph Junghans <ottxor <AT> gentoo.org>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 rpmoffset.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/rpmoffset.c b/rpmoffset.c
index 0a3c488..628af93 100644
--- a/rpmoffset.c
+++ b/rpmoffset.c
@@ -19,6 +19,26 @@
 # define BUFSIZ 8192
 #endif
 
+#if !defined(__GLIBC__)
+static void *rp_memmem(const void *buf, size_t buflen, const void *pattern, size_t len)
+{
+	char *bf = (char *)buf, *pt = (char *)pattern, *p = bf;
+
+	while (len <= (buflen - (p - bf))) {
+		if (NULL != (p = memchr(p, (int)(*pt), buflen - (p - bf)))) {
+			if (0 == memcmp(p, pattern, len))
+				return p;
+			else
+				++p;
+		}
+		else
+			break;
+	}
+	return NULL;
+}
+#define memmem(a,b,c,d) rp_memmem(a,b,c,d)
+#endif
+
 typedef struct {
 	const char *type;
 	const unsigned char *magic;

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     de35a1cd59302a1cc6d3766fcc053b130ab4efa0
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu May 17 04:53:41 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu May 17 04:53:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/rpm2targz.git;a=commit;h=de35a1cd

rpmoffset: add support for LZMA archives

The LZMA format lacks proper magic markings (hence one of the driving
forces for the new XZ format), so we have to rework things to deal with
this fuzzy matching without throwing false positives.

URL: https://bugs.gentoo.org/321439
Reported-by: Peter Volkov <pva <AT> gentoo.org>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 rpmoffset.c |   47 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/rpmoffset.c b/rpmoffset.c
index 628af93..bd1f456 100644
--- a/rpmoffset.c
+++ b/rpmoffset.c
@@ -45,6 +45,16 @@ typedef struct {
 	const size_t len;
 } magic_t;
 
+/* LZMA is some fuzzy crap */
+int is_magic_lzma(const char *buf)
+{
+	const unsigned char *ubuf = (const void *)buf;
+	return (ubuf[0] == 0x5d && ubuf[4] < 0x20) &&
+		(!memcmp(buf + 10, "\x00\x00\x00", 3) ||
+		 !memcmp(buf +  5, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 8));
+}
+#define magic_lzma_len 13
+
 static const unsigned char magic_gzip[]  = { '\037', '\213', '\010' };
 static const unsigned char magic_bzip2[] = { 'B', 'Z', 'h' };
 static const unsigned char magic_xz[]    = { 0xFD, '7', 'z', 'X', 'Z', 0x00 };
@@ -56,12 +66,21 @@ static const magic_t magics[] = {
 #undef DECLARE_MAGIC_T
 };
 #define MAGIC_SIZE_MIN 3
-#define MAGIC_SIZE_MAX 6
+#define MAGIC_SIZE_MAX 13
+
+static int show_magic;
+
+static int magic_finish(const char *magic, size_t offset)
+{
+	if (show_magic)
+		printf("%s ", magic);
+	printf("%zu\n", offset);
+	return 0;
+}
 
 int main(int argc, char *argv[])
 {
-	int show_magic = 0;
-	size_t i, read_cnt, offset, left;
+	size_t i, read_cnt, offset, left, lzma_offset;
 	FILE *fp = stdin;
 	char p[BUFSIZ];
 
@@ -76,6 +95,7 @@ int main(int argc, char *argv[])
 	}
 	/* fp = fopen(argv[1], "r"); */
 
+	lzma_offset = 0;
 	offset = left = 0;
 	while (1) {
 		read_cnt = fread(p + left, 1, sizeof(p) - left, fp);
@@ -89,12 +109,17 @@ int main(int argc, char *argv[])
 				continue;
 
 			needle = memmem(p, sizeof(p), magics[i].magic, magics[i].len);
-			if (needle) {
-				if (show_magic)
-					printf("%s ", magics[i].type);
-				printf("%zu\n", offset + (needle - p));
-				return 0;
-			}
+			if (needle)
+				return magic_finish(magics[i].type, offset + (needle - p));
+		}
+
+		/* Scan for LZMA magic, but don't return yet ... */
+		if (!lzma_offset && read_cnt + left >= magic_lzma_len) {
+			for (i = 0; i <= read_cnt + left - magic_lzma_len; ++i)
+				if (is_magic_lzma(p + i)) {
+					lzma_offset = offset + i;
+					break;
+				}
 		}
 
 		memmove(p, p + left + read_cnt - MAGIC_SIZE_MIN + 1, MAGIC_SIZE_MIN - 1);
@@ -106,6 +131,10 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	/* Delay till the end for LZMA archives since it is too fuzzy */
+	if (lzma_offset)
+		return magic_finish("lzma", lzma_offset);
+
 	if (ferror(stdin))
 		perror(argv[0]);
 

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     e47270acd5e88830a7bea9ae7640de335fd13742
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu May 17 04:59:33 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu May 17 04:59:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/rpm2targz.git;a=commit;h=e47270ac

package with xz rather than lzma

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index ae4c023..8c73e0e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ clean:
 	rm -f *.o rpmoffset rpm2tar $(LINKS)
 
 dist:
-	git archive --prefix=$(P)/ master | lzma > $(P).tar.lzma
+	git archive --prefix=$(P)/ master | xz > $(P).tar.xz
 
 dist-live: clean
 	rm -rf $(P)

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     9abf939441a6d38c512f8723d1c4e62a1f2af611
Author:     Rafał Mużyło <galtgendo <AT> o2 <DOT> pl>
AuthorDate: Fri Apr 24 09:48:36 2020 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 09:48:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/rpm2targz.git/commit/?id=9abf9394

rpmoffset: add zstd support

URL: https://bugs.gentoo.org/719208
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 rpmoffset.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rpmoffset.c b/rpmoffset.c
index bd1f456..99a5c16 100644
--- a/rpmoffset.c
+++ b/rpmoffset.c
@@ -58,11 +58,13 @@ int is_magic_lzma(const char *buf)
 static const unsigned char magic_gzip[]  = { '\037', '\213', '\010' };
 static const unsigned char magic_bzip2[] = { 'B', 'Z', 'h' };
 static const unsigned char magic_xz[]    = { 0xFD, '7', 'z', 'X', 'Z', 0x00 };
+static const unsigned char magic_zstd[]  = { 0x28, 0xB5, 0x2F, 0xFD };
 static const magic_t magics[] = {
 #define DECLARE_MAGIC_T(t) { .type = #t, .magic = magic_##t, .len = sizeof(magic_##t), },
 	DECLARE_MAGIC_T(gzip)
 	DECLARE_MAGIC_T(bzip2)
 	DECLARE_MAGIC_T(xz)
+	DECLARE_MAGIC_T(zstd)
 #undef DECLARE_MAGIC_T
 };
 #define MAGIC_SIZE_MIN 3

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     6c34a5d86120e168b23bc8e35705ba1967231acf
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 22:22:02 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 22:22:02 2021 +0000
URL:        https://gitweb.gentoo.org/proj/rpm2targz.git/commit/?id=6c34a5d8

test: force ASCII output with tests

Test listings are all in ASCII, so ignore host env settings.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index e8d20b7..efedc4a 100755
--- a/test.sh
+++ b/test.sh
@@ -37,7 +37,7 @@ for rpm in ../rpm/*.rpm ; do
 	fi
 	# do not track timestamps as some cpio archives
 	# only contain info for the files, not the dirs
-	tree -apsn -o ../${r}.lst
+	tree -apsn --charset ASCII -o ../${r}.lst
 	mv ../${r}.lst ./
 	diff -u ${r}.lst ../lst/
 	rm -rf ./*

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     344383bc89fc8765e81c19aa2acf6fa95290f754
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 22:33:21 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 22:33:21 2021 +0000
URL:        https://gitweb.gentoo.org/proj/rpm2targz.git/commit/?id=344383bc

build: use HEAD when creating release archive

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 44728f9..0de1edb 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ clean:
 	rm -f *.o rpmoffset rpm2tar $(LINKS)
 
 dist:
-	git archive --prefix=$(P)/ master | xz > $(P).tar.xz
+	git archive --prefix=$(P)/ HEAD | xz > $(P).tar.xz
 
 dist-live: clean
 	rm -rf $(P)

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     9c3a32b22847b9722cd7df893e2d258bf2d48580
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 22:27:10 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 22:27:10 2021 +0000
URL:        https://gitweb.gentoo.org/proj/rpm2targz.git/commit/?id=9c3a32b2

build: ignore release tarballs

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index f0b906a..1963a75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ core
 *.orig
 *.rej
 
+/rpm2targz-*.tar.xz
+
 /rpm2tar
 /rpm2tarbz2
 /rpm2tarlzma

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     0044855b15dbd4fc5be9195f6dd519215c213966
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 22:34:53 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 22:34:53 2021 +0000
URL:        https://gitweb.gentoo.org/proj/rpm2targz.git/commit/?id=0044855b

rpm2tar: have error messages say "error"

This makes it clear that we're aborting & exiting non-zero.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 rpm2targz | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm2targz b/rpm2targz
index b8b4b69..1d3677b 100755
--- a/rpm2targz
+++ b/rpm2targz
@@ -23,7 +23,7 @@
 
 argv0=${0##*/}
 warn() { echo "${argv0}: warning: $*" 1>&2; }
-err()  { echo "${argv0}: warning: $*" 1>&2; exit 1; }
+err()  { echo "${argv0}: error: $*" 1>&2; exit 1; }
 
 usage=false
 stdout=false

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     9c88ad056256ebc6c195b0d589952d801a822f0f
Author:     Erik Zscheile <zseri.devel <AT> ytrizja <DOT> de>
AuthorDate: Mon Mar 15 23:42:44 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 23:42:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/rpm2targz.git/commit/?id=9c88ad05

rpm2tar: add support for zstd files

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 Makefile  | 2 +-
 rpm2targz | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8c73e0e..d986108 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ dist-live: clean
 	mkdir $(P)
 	cp `find . -maxdepth 1 -type f '!' -name .gitignore` $(P)
 
-LINKS = $(patsubst %,rpm2%,tar tarbz2 tbz2 tarlzma tgz tarxz txz)
+LINKS = $(patsubst %,rpm2%,tar tarbz2 tbz2 tarlzma tgz tarxz txz tarzst)
 links:
 	set -e; for t in $(LINKS) ; do $(dosym) rpm2targz $$t ; done
 

diff --git a/rpm2targz b/rpm2targz
index d32300c..b8b4b69 100755
--- a/rpm2targz
+++ b/rpm2targz
@@ -80,6 +80,7 @@ case ${argv0#rpm} in
 	2tgz)     compress="gzip"  suffix=".tgz";;
 	2tarxz)   compress="xz"    suffix=".tar.xz";;
 	2txz)     compress="xz"    suffix=".txz";;
+	2tarzst)  compress="zstd"  suffix=".tar.zst";;
 	2targz|*) compress="gzip"  suffix=".tar.gz";;
 esac
 case ${argv0} in

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     e8c12b5d196e5b6cc9181fc6c34ca438d0cfa3c9
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 22:12:48 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 22:12:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/rpm2targz.git/commit/?id=e8c12b5d

README: rewrite & update

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 README.md               | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
 rpm2targz.README        | 16 --------------
 rpm2targz.README.Gentoo | 10 ---------
 3 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6cafe1c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,58 @@
+# rpm2targz
+
+A simple tool to convert [Red Hat packages (RPMs)](https://en.wikipedia.org/wiki/RPM_Package_Manager)
+to a more common [tar](https://en.wikipedia.org/wiki/Tar_%28computing%29) format.
+
+* Homepage: https://gitweb.gentoo.org/proj/rpm2targz.git/
+* Bugs/patches/etc...: https://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux
+
+## History
+
+Slackware has long provided a `rpm2tgz` tool to convert between Red Hat's RPM
+package format and Slackware's tgz package format.  It included a `rpm2targz`
+program.  Slackware doesn't really have a dedicated project site for it since
+it's part of the "base distro", so contributing changes back is difficult.
+
+Since unpacking RPMs w/out the `rpm` program is a generally useful function,
+Gentoo imported & forked it decades ago, and has since maintained a number of
+improvements & updates.  Gentoo has opted to call the package `rpm2targz` to
+help disambiguate and make it a little more clear that the focus is on generic
+tar's rather than Slackware's tgz packages.  It's unclear how many people
+picked up on this nuance ;).
+
+Gentoo's `rpm2tgz` is specifically not compatible with Slackware's version.
+Slackware's version is geared towards actually installing RPM's when your host
+host distro is actually Slackware, while Gentoo's is meant to just be a generic
+archive manipulation tool.  Basically we consider the "tgz" to be a short name
+for "tar.gz" rather than a package format by itself.
+
+The versioning has become desynced between the two projects.  Since Slackware
+just included it in the distro, Gentoo used the overall Slackware distro version
+when importing.  That's how we got:
+* [rpm2targz-8.0.ebuild](https://gitweb.gentoo.org/repo/gentoo/historical.git/commit/?id=f4b34ca583b02f43962aa13fa7dc9384e2804cd8)
+* [rpm2targz-9.0.ebuild](https://gitweb.gentoo.org/repo/gentoo/historical.git/commit/?id=8542b4a88931bd4fec2e29753ba3f014a19681ce)
+
+As the Gentoo version diverged from Slackware's, we added `.0.#g` to the end to
+differentiate itself (with the "g" being short for "Gentoo").  Gentoo has now
+moved on to the more common date-based version style since there's no point in
+staying in sync anymore.
+
+## Slackware Readme
+
+* http://www.slackware.com/config/packages.php
+* https://pkgs.org/download/rpm2tgz
+
+This package contains 'rpm2targz', a simple utility to convert Red Hat-style
+RPM packages into standard tar.gz archives.  Converted binary packages can then
+be installed/removed using the 'installpkg/removepkg' commands, or 'pkgtool'.
+
+It's advisable to at least examine the converted package with 'less' to make
+sure it won't do anything too crazy to your system.
+
+By default, rpm2targz will attempt to use "file" to detect source RPMS, and will
+put the contents into a subdirectory in the resulting package.  This may not be
+portable to other operating systems -- if you're trying to run rpm2targz on an
+OS that doesn't have a file that knows RPM types, and you care about this source
+RPM feature, you can compile and install David Cantrell's standalone getrpmtype
+utility.  The getrpmtype.tar.gz source archive can be found in Slackware's
+source tree in source/a/bin/.

diff --git a/rpm2targz.README b/rpm2targz.README
deleted file mode 100644
index 9936f05..0000000
--- a/rpm2targz.README
+++ /dev/null
@@ -1,16 +0,0 @@
-
-This package contains 'rpm2targz', a simple utility to convert Red Hat-style
-RPM packages into standard tar.gz archives.  Converted binary packages can then
-be installed/removed using the 'installpkg/removepkg' commands, or 'pkgtool'. 
-
-It's advisable to at least examine the converted package with 'less' to make
-sure it won't do anything too crazy to your system.
-
-By default, rpm2targz will attempt to use "file" to detect source RPMS, and will
-put the contents into a subdirectory in the resulting package.  This may not be
-portable to other operating systems -- if you're trying to run rpm2targz on an
-OS that doesn't have a file that knows RPM types, and you care about this source
-RPM feature, you can compile and install David Cantrell's standalone getrpmtype
-utility.  The getrpmtype.tar.gz source archive can be found in Slackware's
-source tree in source/a/bin/.
-

diff --git a/rpm2targz.README.Gentoo b/rpm2targz.README.Gentoo
deleted file mode 100644
index 7344d5d..0000000
--- a/rpm2targz.README.Gentoo
+++ /dev/null
@@ -1,10 +0,0 @@
-We've accumulated too many patches/fixups/etc... to keep our sanity, so
-rpm2targz is now maintained in a git repo which we make releases from (so
-hopefully other distros can take advantage of things).
-
-You can find that repository here:
-http://git.overlays.gentoo.org/gitweb/?p=proj/rpm2targz.git;a=summary
-
-The versioning schema is simple.  Just append '.0.#g' to the upstream version
-(which in this case is '9.0').  Increment the '#' over time.  The 'g' is short
-for Gentoo.  Awesome.

[gentoo-commits] proj/rpm2targz:master commit in: /

[Mike Frysinger]

commit:     8ba5321b47e8b8e44fbc1906d9d428113437676a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 22:26:29 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 22:26:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/rpm2targz.git/commit/?id=8ba5321b

build: switch to datestamps

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d986108..44728f9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CFLAGS += -Wall
 
-VER ?= 9999
-PV = 9.0.0.$(VER)g
+VER ?= `date +%Y.%m.%d`
+PV = $(VER)
 P = rpm2targz-$(PV)
 
 DESTDIR =