summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Housh <jaeger@crux.ninja>2021-08-21 15:07:35 -0500
committerMatt Housh <jaeger@crux.ninja>2021-08-21 15:07:35 -0500
commit1920445d6110d6ac8d2b50ee2ce8b8d1395e3703 (patch)
treed67b99b76f02c6aa3360b062a214bc80929e48d7
parent0bca6106717ebe7b3ac7769a58d79f0a36a6a8c5 (diff)
downloadcontrib-1920445d6110d6ac8d2b50ee2ce8b8d1395e3703.tar.gz
contrib-1920445d6110d6ac8d2b50ee2ce8b8d1395e3703.tar.xz
squashfs-tools: updated to version 4.5
-rw-r--r--squashfs-tools/.footprint2
-rw-r--r--squashfs-tools/.signature9
-rw-r--r--squashfs-tools/Pkgfile8
-rw-r--r--squashfs-tools/destdir.patch17
4 files changed, 29 insertions, 7 deletions
diff --git a/squashfs-tools/.footprint b/squashfs-tools/.footprint
index d88f6a770..de6c01010 100644
--- a/squashfs-tools/.footprint
+++ b/squashfs-tools/.footprint
@@ -1,3 +1,5 @@
drwxr-xr-x root/root sbin/
-rwxr-xr-x root/root sbin/mksquashfs
+lrwxrwxrwx root/root sbin/sqfscat -> unsquashfs
+lrwxrwxrwx root/root sbin/sqfstar -> mksquashfs
-rwxr-xr-x root/root sbin/unsquashfs
diff --git a/squashfs-tools/.signature b/squashfs-tools/.signature
index 9f7d75725..e5a2679cc 100644
--- a/squashfs-tools/.signature
+++ b/squashfs-tools/.signature
@@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF311+lE31w5e8zxhbHU7Plqud37W2KqDM0GZV4cdrQNk2eqZQ6HifOL0RK0/o6D2GGigpCI9sjLSG0WxOzQb/kA0=
-SHA256 (Pkgfile) = 6a81a5fdcc08ca2250b0b50485d6cefef352035653639995e1599d83c8faf8ac
-SHA256 (.footprint) = ef8b3c9cd38c4fe9ee8f80af59cbd2282bccef8f8a2eb00332ed67fa8a24fb57
-SHA256 (squashfs-tools-4.4.tar.gz) = a7fa4845e9908523c38d4acf92f8a41fdfcd19def41bd5090d7ad767a6dc75c3
+RWSagIOpLGJF37tOdh4p5tgwBxJ5Q4n9ahE11s3XFolivu3Uzc6IOTQF7DqxxJqIxB61Q4wCmjaoow66m69YdXqyVYSWNZLmlgk=
+SHA256 (Pkgfile) = c59485f5e2d2dd370190375d92226fb2b05193300288615007d321c9c98f0b30
+SHA256 (.footprint) = 46ee2e8e8d666941206c63f7a8791370ed61e08ca5068a89b81d95d3e0e1da68
+SHA256 (squashfs-tools-4.5.tar.gz) = b9e16188e6dc1857fe312633920f7d71cc36b0162eb50f3ecb1f0040f02edddd
+SHA256 (destdir.patch) = 8fb613af82bf1c032a6f23b457ff0efa32c8a891f97580e90d93a911fe3a9be4
diff --git a/squashfs-tools/Pkgfile b/squashfs-tools/Pkgfile
index 0793b2398..e6efd1d0e 100644
--- a/squashfs-tools/Pkgfile
+++ b/squashfs-tools/Pkgfile
@@ -4,12 +4,14 @@
# Depends on: gzip lzo xz
name=squashfs-tools
-version=4.4
+version=4.5
release=1
-source=(https://github.com/plougher/$name/archive/$version/$name-$version.tar.gz)
+source=(https://github.com/plougher/$name/archive/$version/$name-$version.tar.gz\
+ destdir.patch)
build() {
cd $name-$version/$name
+ patch -p2 -i $SRC/destdir.patch
make GZIP_SUPPORT=1 LZO_SUPPORT=1 XZ_SUPPORT=1 EXTRA_CFLAGS="-fcommon"
- make install INSTALL_DIR=$PKG/sbin
+ make install INSTALL_DIR=/sbin DESTDIR=$PKG
}
diff --git a/squashfs-tools/destdir.patch b/squashfs-tools/destdir.patch
new file mode 100644
index 000000000..2cf0b60fc
--- /dev/null
+++ b/squashfs-tools/destdir.patch
@@ -0,0 +1,17 @@
+diff -urN squashfs-tools-4.5.orig/squashfs-tools/Makefile squashfs-tools-4.5/squashfs-tools/Makefile
+--- squashfs-tools-4.5.orig/squashfs-tools/Makefile 2021-07-22 20:11:24.000000000 +0000
++++ squashfs-tools-4.5/squashfs-tools/Makefile 2021-08-21 20:04:10.212179427 +0000
+@@ -403,8 +403,8 @@
+
+ .PHONY: install
+ install: mksquashfs unsquashfs
+- mkdir -p $(INSTALL_DIR)
+- cp mksquashfs $(INSTALL_DIR)
+- cp unsquashfs $(INSTALL_DIR)
+- ln -fs $(INSTALL_DIR)/unsquashfs $(INSTALL_DIR)/sqfscat
+- ln -fs $(INSTALL_DIR)/mksquashfs $(INSTALL_DIR)/sqfstar
++ mkdir -p $(DESTDIR)/$(INSTALL_DIR)
++ cp mksquashfs $(DESTDIR)/$(INSTALL_DIR)
++ cp unsquashfs $(DESTDIR)/$(INSTALL_DIR)
++ ln -fs unsquashfs $(DESTDIR)/$(INSTALL_DIR)/sqfscat
++ ln -fs mksquashfs $(DESTDIR)/$(INSTALL_DIR)/sqfstar

Generated by cgit