diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | PKGBUILD | 23 | ||||
| -rw-r--r-- | subprocess-check_output.patch | 12 |
3 files changed, 28 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index 0f3d231e02c6..a7af99dff486 100644 --- a/.gitignore +++ b/.gitignore @@ -4,13 +4,14 @@ pkg/ src/ *.gz *.bz2 +*.jar *.xz *.lzo *.xz4 +*.zst +*.tar *.tgz *.tbz *.txz -*.tar -*.jar +*.tzst *.zip -compress @@ -3,31 +3,32 @@ pkgname=btrfs-compress # compress is too generic a name!!! Also the script is unmaintained upstream but still works. _pkgname=compress -pkgver=20190221.r12 +pkgver=1.0.0 pkgrel=1 +epoch=1 pkgdesc="btrfs tool that makes it possible to change +c flags recursively on existing files" -arch=('i686' 'x86_64') +arch=('x86_64') url="https://github.com/benapetr/compress" license=('BSD') depends=('python') makedepends=('git') -source=("git+https://github.com/benapetr/$_pkgname.git#commit=394be8f2a44b8587c7190decf4d758e15dfed9d7") -b2sums=('SKIP') +source=("btrfs-compress-"$pkgver".tar.gz::https://github.com/benapetr/compress/archive/refs/tags/"$pkgver".tar.gz" + "subprocess-check_output.patch") +b2sums=('4267c636a6482ad50d7ab9b6acf4250f0aaa080f143a9b934ae783eed8edaaa62b13733359e1aa3a4adc8f920902802628da15b26443359025f7ac661c6ce2e5' + '118ab7f3be34fbfdc9dd99baa40f98e48f4aee310cce20e1696222a81a82a626859a8d1b526cf21fc02c84b8a0019d184c3c3e8b6937b3af52b551c92ef6d497') -pkgver() { - cd "$_pkgname" - printf "%s.r%s" \ - "$(git log -1 --format="%cd" --date=short | sed 's/\-//g')" \ - "$(git rev-list --count HEAD)" +prepare() { + cd "$_pkgname-$pkgver" + patch -p1 < ../subprocess-check_output.patch } build() { - cd "$_pkgname" + cd "$_pkgname-$pkgver" sed -i -e 's!\(/usr/bin/\)env !&!' src/$_pkgname } package() { - cd "$_pkgname" + cd "$_pkgname-$pkgver" install -D -m 755 src/$_pkgname "$pkgdir"/usr/bin/btrfs-compress install -D -m 644 README.md "$pkgdir"/usr/share/doc/btrfs-compress/README.md install -D -m 644 LICENSE "$pkgdir"/usr/share/licences/btrfs-compress/LICENSE diff --git a/subprocess-check_output.patch b/subprocess-check_output.patch new file mode 100644 index 000000000000..11f04ab93f06 --- /dev/null +++ b/subprocess-check_output.patch @@ -0,0 +1,12 @@ +diff -urN a/src/compress b/src/compress +--- a/src/compress 2019-02-21 06:44:17.000000000 -0500 ++++ b/src/compress 2023-02-10 10:38:24.963134333 -0500 +@@ -52,7 +52,7 @@ + result = subprocess.check_output(["lsattr", path]).strip() + if (result == ''): + raise Exception('lsattr returned nothing') +- result = result[:result.index(" ")] ++ result = result[:result.index(b' ')] + for f in result: + if (f == 'c'): + return True |