mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 18:06:59 +02:00
bump(sys-fs/squashfs-tools): sync with upstream
This commit is contained in:
David Michael
parent
3299bb8ff7
commit
174597c4b0
@ -9,4 +9,4 @@ RDEPEND=sys-libs/zlib
|
||||
SLOT=3.0
|
||||
SRC_URI=mirror://sourceforge/squashfs/squashfs3.2-r2.tar.gz
|
||||
_eclasses_=multilib 0236be304ee52e7f179ed2f337075515 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee
|
||||
_md5_=60c865dd397baeef2893128f0bfdd004
|
||||
_md5_=ec2e57b7ed437328a02716060ce8bfe0
|
||||
|
||||
@ -9,4 +9,4 @@ RDEPEND=sys-libs/zlib
|
||||
SLOT=3.1
|
||||
SRC_URI=mirror://sourceforge/squashfs/squashfs3.4.tar.gz
|
||||
_eclasses_=multilib 0236be304ee52e7f179ed2f337075515 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee
|
||||
_md5_=a5dfd75db98a94d5ce7c18d0e2710de5
|
||||
_md5_=c4e236db102fbbbb6bf3e2418e9c36f7
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare
|
||||
DEPEND=sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils )
|
||||
DESCRIPTION=Tool for creating compressed filesystem type squashfs
|
||||
EAPI=5
|
||||
HOMEPAGE=http://squashfs.sourceforge.net
|
||||
IUSE=+xz lzma lz4 lzo xattr
|
||||
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz
|
||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee
|
||||
_md5_=d0c1d199226f09a512fde5f346e71c10
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare
|
||||
DEPEND=sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils )
|
||||
DESCRIPTION=Tool for creating compressed filesystem type squashfs
|
||||
EAPI=5
|
||||
HOMEPAGE=http://squashfs.sourceforge.net
|
||||
IUSE=lz4 lzma lzo xattr +xz
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz mirror://debian/pool/main/s/squashfs-tools/squashfs-tools_4.3-3.debian.tar.xz
|
||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee
|
||||
_md5_=629cc2f00f33893a90f20934833bf882
|
||||
@ -4,10 +4,10 @@ DESCRIPTION=Tool for creating compressed filesystem type squashfs
|
||||
EAPI=5
|
||||
HOMEPAGE=http://squashfs.sourceforge.net
|
||||
IUSE=debug lz4 lzma lzo static xattr +xz
|
||||
KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
|
||||
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz mirror://debian/pool/main/s/squashfs-tools/squashfs-tools_4.3-3.debian.tar.xz
|
||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee
|
||||
_md5_=1dfbbe1423b829c631cf89fb295dc355
|
||||
_md5_=e640d47a2cd7723a3e29afe9fa4d4007
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
AUX squashfs-tools-4.3-2gb.patch 961 SHA256 cdb9c85c2f733c0db879275d0ee2480f528aa3191f236bbf1ff681c75b14a024 SHA512 c45cad7822964ad4c74ea36fdd833fbfaf9e8e047726fa7a9517392bfa0b04a4de348bf3a511b071ac36d045c40cab0d8efeff054ebcd90b94f8508516b7dd71 WHIRLPOOL d3581d6014ecac4d4fa7a21e62829cb78c6ffa9fe148680d1fa43434bb1adb26c1dfb2f25fe58cfa22d16dbc2a922f7201a1d6bff94fd786456d28f445744e8f
|
||||
AUX squashfs-tools-4.3-aligned-data.patch 375 SHA256 3030ddfa5ba9d0baea7f5e4761b33dea67fbc4d49c86e475830fc1bfbfddb145 SHA512 566e2ada5e86afc799cb0c52396179bedfbcc49349bc6eb43c048b96215b1638c3765f7c75c6fa35593d5a95a1111df7c29a143ee4a55eaf33a6663e9bfe1b25 WHIRLPOOL 798dda9e91f3c68148e3f974caf62536745c1e22267d8e551903d49c3808a8e5a27ea1ac3787ef556823035d82d68a97974620f1f0871e7c14841c781899d077
|
||||
AUX squashfs-tools-4.3-extmatch.patch 3487 SHA256 2ec937250adfd97a72373e91225cead3070d987b4249ee487fd2d6caac74b235 SHA512 e034320ace6b992968d3f6776aeb0b94237619585e7fac195e917622b941bbfbddc62b625409f79fe7a1853ab58f76d6679c28320646b6883eb58183a3adfdea WHIRLPOOL 1f1057e8866666a06d06db99928a283e875720b09bb11e4cd3ce883716f64fcf4742889508cf4a720e37ae31cc5c4b942ef6e99c5bca97ddfd29e1d11a342472
|
||||
AUX squashfs-tools-4.3-local-cve-fix.patch 620 SHA256 7edceedead4f5a57dc009afecd0f414d60a3878dc43f8de5224bff391ed32c76 SHA512 8e308217136f8b50bc89b49017ae706978d5c8a42a74deeef268e9aaaf6ae5785926da99711462374dfc98f2f193840b0e016b1845be1f9bad168047e4574367 WHIRLPOOL 6eda9f29a2f5786cc7538bfe26b6ff632b0be6f361f963c7ad39c83608bc62c7e972074be264587d8e65d254812b1b715a57c0dd2ef5eedc9d424c9f53fc54e7
|
||||
AUX squashfs-tools-4.3-mem-overflow.patch 981 SHA256 a94f9df3439bef373da31a734e6dad42f5fc5a6d91f2b9d15d30b02f1aac73b3 SHA512 00db6700ab7fbf7f71aa97b45ac9c629dc5e7b1731c3e3eb5c93a0891c1b0f79884df7b6a8672facd9104e9442448ba9657dd10b64d47d89abd1b9ae1969dc2e WHIRLPOOL af0c8a6c4f3218abbc800516cfb58626563ab1967da8b86702ca523f1db22e006b71f93e23bb04b4bef48ae9c463ea1fdaecb4af371353f09b65375050c9fd59
|
||||
AUX squashfs-tools-4.3-musl.patch 688 SHA256 f18ebfe8de97702068825be2f92a7363939ccd0b4b0506662021f15b9b5d1c15 SHA512 61fb8eaedc4e649eb8fb362150cf5faef2289cb42514300f63448d164a12c9b21539ae49f6dc0d78fa1e4a3be01b26cb9084cec7f0159fe026fc1caa19df18dd WHIRLPOOL 44c451e0d2dabc9e90379b761f4623cd218740c69c20a9e5460d680243fea80b19d72d1f7645bb7b48b3a8a70bf8bb2277732f39129ca9f7a7b3cd74ba7c67ac
|
||||
AUX squashfs-tools-4.3-sysmacros.patch 611 SHA256 b44afb79ba6108a657fe6c51cecdf0e9623cbc91234b297478a6c3308cf0eddf SHA512 c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a WHIRLPOOL b0e0db62a80dc4c706dfd70ada83042ed5e66ecf881cf2b2055d09b838814571ac174a1f4c7a2a8bfc2ad242d10c717caa2ef03716b484f165d94d0e30f6e1d9
|
||||
AUX squashfs-tools-4.3-xattrs.patch 1076 SHA256 f98fb6bee2f46ba57b9ab68dbc1ad15ed5ac8c7592cbdfead36d6642096acada SHA512 3899bb72cabeb296eb12fdd1c2e77e82a4354e58c91c69be918950c7fc88f56fbc0265c915b7363704579b710a69a35312fa9ab3d43236900774ae97efd473a8 WHIRLPOOL b39d57dc7caa7468ea54396416485986c8867af1b2905f3b08266afb66b23484dda41b399fff1d0f80031c5b729c24af4a91908ed1239885fa3ce3368fdbf288
|
||||
DIST squashfs-tools_4.3-3.debian.tar.xz 15252 SHA256 1c296cc147e322e7124bf23a3c242ac83f6a986e6d6f64829ad2424b33914fc4 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae WHIRLPOOL 4f5a12a3371f2adced8f3a50b1d25db4420c2ff63856bbe74489e945c4698eb0e327ce677e442678849118f45351d01b14aef075ed78e6c09acb83ce56c99c3d
|
||||
DIST squashfs3.2-r2.tar.gz 314764 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7 SHA512 983f1fa966c15fb4929eaaf2d88401aac72f6d04e8c5523bd46397bc28928ff13b638e0e96bc09650627449c37f6a654ffa727445f1e9ca13cdc9de4fc43012f WHIRLPOOL 14b22cfc16e5c9bc91a5e02b9d4b64589339162d59613b12c2344acbed34690616a7a0254d9a63f839e96ff4b850f30fd7e1e855aecb76423356f4b1d8582129
|
||||
DIST squashfs3.4.tar.gz 352660 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339 SHA512 5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe WHIRLPOOL 7c113f3a66d0d28310302017e5f317d14bb5576e680a8f94e687193a376db92c54920be7d1121637f860cafa802d665ba419115e976b07029ca1f0c51953972d
|
||||
DIST squashfs4.3.tar.gz 182550 SHA256 0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6 SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 WHIRLPOOL c819f416b34cc46a232b8bc385017774603f81b4a865e6b97208004c183ebad5de7d0f726be444f8cb4e1d450abed9340dab730aec0762407f034e99b39bdc06
|
||||
EBUILD squashfs-tools-3.2_p2.ebuild 960 SHA256 146cbfbf53a748c6c0b56218fd860d8c8d3db4dd4847a70cd6bb6a4fc1669383 SHA512 01eab80416c6fa4185b32d17fd4d6fb6ec773fac619e93877f7ad5ebe7b8984d1c69dc14a906c90f3331080aca4ebb081a5aa4f24613e2bd7a9804acd9d33e1f WHIRLPOOL 3146382a57f338185cafaec6e5b64dfb722505155d234d1a8daa78a008fde04eaebc1494f5d29d5fe11c0d4bc2aaedaa4c8ab453231ebb494eef0e7fe52d7e1c
|
||||
EBUILD squashfs-tools-3.4.ebuild 944 SHA256 6ceec93092fc18d7faca0a24474e173921ce3fbea878404532fe85f3a10ca39e SHA512 650e0fa9cf5daa7f014b685f4c421a34792f09b3de3b2385234c34d49d56f57ac886baaed1b3558b059155338562b292d464f7e994bf1b918c3d693e143f88de WHIRLPOOL bfa1f19b82ed9408cae6c513d4d3f193afb20228a03629848bda2b13faa77cf066fbe79119304459e7beb684c8911b70b5d4924566f0ef94fc54472bf08074fe
|
||||
EBUILD squashfs-tools-4.3-r1.ebuild 1492 SHA256 b393a3b419c1b11531c9793d4577997a197a4c48e2133a7be1a2d3fd51270204 SHA512 063f9e454640af97c37b354eafd207ab1578c61ece33f3706b4f9af6e3bf06ee2f1f4dfc4dce1ea69bf16c8b8e8c66d709e248b15a0140d55c9d6488ed90bcd0 WHIRLPOOL 1d52874d32f97a18aeb3aca12c1212f8edebe93be6c4b9f12bdbe60d9999e0c9ca7842b3e5c4b5163b5bdd10e3a4ea26173df0eb249878eaf49597a3b10fb23d
|
||||
EBUILD squashfs-tools-4.3-r2.ebuild 1958 SHA256 994e45548df15c79b5e06ac41b65db060eee27c2126509f0a04cf4efff71b5d7 SHA512 83e35022929623af09033b451e79b213a89173cbe0aecf4f3198f915a65514762983612e475f3c0c49a74b6d7aa65adfbc555821f406f104e09639653d47549b WHIRLPOOL 40a2a552ccce2339a90ca0a82b4b24b25f91f4de92985b67ef114369a89d87291299a4d130ccac269733e8d20f93b7434f303b46df064d4d3650f2cdaf186c5e
|
||||
EBUILD squashfs-tools-4.3.ebuild 1249 SHA256 03a4c1b165c5e584f6ac8679edbf4f69bd270e57f28a9b4e7b26b75af9e8de55 SHA512 e0a362cfc8228f945aacd203f6c10465235bb0a2d9dbf7a071d91a216d55049b04dff03c62bb7040575921e4367b82d0726a8fb5c9c4b4f6d3595d52cc2a823a WHIRLPOOL 1339a17a3cc78659c2a90f65358869d594942a3cf5bd908367c08f4eb64873456386f24052d8f3d23bf533460077493e025432038c021254f8c24cfc07ebd0cb
|
||||
EBUILD squashfs-tools-3.2_p2.ebuild 953 SHA256 378ed13f72b193ae57f6e7dfa73e0497dd2dd576e2f02d6bb1d4065a32d75487 SHA512 989198cdeb688add1cd826743ab55b7ff33f0de87bf8338e4d6d14882dc79452ebf54fc393a41365e10efa22da1e0e0643f2ea50f4c4fabc8ab969517845f129 WHIRLPOOL e08b0d35c663be1e1bce2e583422549e53c13a731b25c2b41e0293d60a4e69434abd96f6189331da27947853aedb58006d959f76323ae47a5dccd1aa2fb05576
|
||||
EBUILD squashfs-tools-3.4.ebuild 937 SHA256 cc5393a6ac2d6563388f851b5d8960f4406df92193f3c22a1ed869a19e417937 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b WHIRLPOOL d18c907a2bf4bb378635dc1b8f8d028fc4e90bb9068c3a9ecc018ae9bf71cddb19fae343092c668594d3b8e5fc1383983d15c926e2717976f4849723762f11fd
|
||||
EBUILD squashfs-tools-4.3-r2.ebuild 2129 SHA256 79a5da851793eba5b94a5b9bc5dc87f2b430e25659ff3cbabf3115079c23be7d SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec WHIRLPOOL 40caa4996831fd8c3711e16b8adc7a548dd5b7ab4c1c4d71042034949bed640aad1976be9f5ee0943d9768a65385c04183c68318237463861885814dd0956e96
|
||||
EBUILD squashfs-tools-9999.ebuild 1649 SHA256 39a6b5ef9618b67ffccf0ec3ce56b0c497ada8269fd70b891da03abf6d1fefaf SHA512 0535d76acba1893795b029dd8f0315fa5d1a96ff5048bffa9cac18a221b3204abcc2173e5ab26e8fad427824bee1aebfedef2d40f1cd8cf3a26c0b9a30972628 WHIRLPOOL 246c8c30868c05566649c9eb818891f6a067161e87ecbc462f4833f5498e81f1cc50800f03f7cc82d67ec89c206d32b7cf0cc29cb7cc3a51a52a4066214ddd55
|
||||
MISC ChangeLog 4767 SHA256 ca930de230c6edc3ce963be226d53d0e67678f7cbac5ee9900b2f7226c689788 SHA512 d3ed4b7163ecefdf2c15d797a0a4c48d3d78bd18a38b8cf973c54f389c856ec1efb9571ba1721d0911fddd9c8f4eac3de7ce195b299db29ec8a5bb3405052480 WHIRLPOOL 3adaa033364cca55a944824d27cd448dcc4f846a471d42c0dbce1abc4286e5738266579910a0426432d9434c2ffcf30c683adac0fe37de9ee3a28af1c74072b1
|
||||
MISC ChangeLog 4948 SHA256 048b1ddb2aef544d992020d83546b567bd89ccdbc92b902e6b993a80e60d115f SHA512 6baf9d18b382033117f4a7ca46dfd9196af0c3b6b60d7b3b4073d6aecadacddd2816631fbab7f3ee308abf768fc2e6d5e82ffa4f9517e8c69344c106aff36bee WHIRLPOOL b8ec6c9c0a646c4c5ce8b30080d38168f50c0a7da1fb0c7567efb2eb8e869be6547574d3f24da2d87d5f805bcaaad2ebb75940fe3099f4c19b4f5040692f9be6
|
||||
MISC ChangeLog-2015 18760 SHA256 a731f71798d4dcbb59b9001f81a73064961bc450ba3f4e6de3fb790112eaf571 SHA512 58d3ee1c7ed0327c87d8bec39fcb309095adc8c500aa919c74cb461d13e9e745e632fc07207109dbab677ab4ac1862cbe1ec08af74f98cafc92d2a26e9d931be WHIRLPOOL 8188d57e0e1c6b6dcfd5be583571e38ea9db21ded8bb60355e60a2ed8eb34debc72cfaa79fa122e787085ded69a64567269e9ded619d63fdc36852f6b61ff110
|
||||
MISC metadata.xml 559 SHA256 5813dae0eff3bfed9a7a40ac785726804d493f175479c1cc10ee3ea566b6eb2d SHA512 2318c516e5e76a6c802563d1e1bf60273dbfd6a6cf0944a41e5287f0c85f1b73761ba050599dfb3b2c86a53da01fc752bb4c74397c404c4ff68eb73dfedf2572 WHIRLPOOL 763a763428e1ca87f7fc653cc7984a88bac9ffb256464e7fe2258f901ab4283819998c560197aa1e558e17a3b3c4bdb480a2b9df696efadd81c4cd00a47cfade
|
||||
|
||||
@ -0,0 +1,121 @@
|
||||
From https://github.com/plougher/squashfs-tools/pull/9
|
||||
|
||||
From 4280e74de14070869787a9166242f9ce2dafd82e Mon Sep 17 00:00:00 2001
|
||||
From: Alexandru Ardelean <aa@ocedo.com>
|
||||
Date: Wed, 6 Jan 2016 15:33:43 +0200
|
||||
Subject: [PATCH] squashfs-tools: with fnmatch.h compatibility with musl
|
||||
|
||||
musl does not define FNM_EXTMATCH
|
||||
|
||||
Signed-off-by: Alexandru Ardelean <aa@ocedo.com>
|
||||
---
|
||||
squashfs-tools/action.c | 2 +-
|
||||
squashfs-tools/fnmatch_compat.h | 32 ++++++++++++++++++++++++++++++++
|
||||
squashfs-tools/mksquashfs.c | 2 +-
|
||||
squashfs-tools/unsquashfs.c | 1 +
|
||||
squashfs-tools/unsquashfs.h | 1 -
|
||||
5 files changed, 35 insertions(+), 3 deletions(-)
|
||||
create mode 100644 squashfs-tools/fnmatch_compat.h
|
||||
|
||||
diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c
|
||||
index 35889a4..4b06ccb 100644
|
||||
--- a/squashfs-tools/action.c
|
||||
+++ b/squashfs-tools/action.c
|
||||
@@ -31,7 +31,6 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
-#include <fnmatch.h>
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
#include <sys/wait.h>
|
||||
@@ -43,6 +42,7 @@
|
||||
#include "mksquashfs.h"
|
||||
#include "action.h"
|
||||
#include "error.h"
|
||||
+#include "fnmatch_compat.h"
|
||||
|
||||
/*
|
||||
* code to parse actions
|
||||
diff --git a/squashfs-tools/fnmatch_compat.h b/squashfs-tools/fnmatch_compat.h
|
||||
new file mode 100644
|
||||
index 0000000..7b4afd8
|
||||
--- /dev/null
|
||||
+++ b/squashfs-tools/fnmatch_compat.h
|
||||
@@ -0,0 +1,32 @@
|
||||
+#ifndef FNMATCH_COMPAT
|
||||
+#define FNMATCH_COMPAT
|
||||
+/*
|
||||
+ * Squashfs
|
||||
+ *
|
||||
+ * Copyright (c) 2015
|
||||
+ * Phillip Lougher <phillip@squashfs.org.uk>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU General Public License
|
||||
+ * as published by the Free Software Foundation; either version 2,
|
||||
+ * or (at your option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program; if not, write to the Free Software
|
||||
+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
+ *
|
||||
+ * fnmatch_compat.h
|
||||
+ */
|
||||
+
|
||||
+#include <fnmatch.h>
|
||||
+
|
||||
+#ifndef FNM_EXTMATCH
|
||||
+#define FNM_EXTMATCH 0
|
||||
+#endif
|
||||
+
|
||||
+#endif
|
||||
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
|
||||
index d221c35..4e7cbdd 100644
|
||||
--- a/squashfs-tools/mksquashfs.c
|
||||
+++ b/squashfs-tools/mksquashfs.c
|
||||
@@ -46,7 +46,6 @@
|
||||
#include <sys/mman.h>
|
||||
#include <pthread.h>
|
||||
#include <regex.h>
|
||||
-#include <fnmatch.h>
|
||||
#include <sys/wait.h>
|
||||
#include <limits.h>
|
||||
#include <ctype.h>
|
||||
@@ -76,6 +75,7 @@
|
||||
#include "read_fs.h"
|
||||
#include "restore.h"
|
||||
#include "process_fragments.h"
|
||||
+#include "fnmatch_compat.h"
|
||||
|
||||
int delete = FALSE;
|
||||
int fd;
|
||||
diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
|
||||
index 1323dd6..2428baa 100644
|
||||
--- a/squashfs-tools/unsquashfs.c
|
||||
+++ b/squashfs-tools/unsquashfs.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "xattr.h"
|
||||
#include "unsquashfs_info.h"
|
||||
#include "stdarg.h"
|
||||
+#include "fnmatch_compat.h"
|
||||
|
||||
#include <sys/sysinfo.h>
|
||||
#include <sys/types.h>
|
||||
diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h
|
||||
index ecd0bb4..0edbd25 100644
|
||||
--- a/squashfs-tools/unsquashfs.h
|
||||
+++ b/squashfs-tools/unsquashfs.h
|
||||
@@ -40,7 +40,6 @@
|
||||
#include <grp.h>
|
||||
#include <time.h>
|
||||
#include <regex.h>
|
||||
-#include <fnmatch.h>
|
||||
#include <signal.h>
|
||||
#include <pthread.h>
|
||||
#include <math.h>
|
||||
@ -0,0 +1,24 @@
|
||||
From https://github.com/plougher/squashfs-tools/pull/9
|
||||
|
||||
From b0ca8a5c98ff73e70b2ab1bc24aa824aa2458287 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandru Ardelean <aa@ocedo.com>
|
||||
Date: Wed, 6 Jan 2016 15:36:48 +0200
|
||||
Subject: [PATCH] pseudo.c: add explicit <sys/stat.h> include
|
||||
|
||||
Signed-off-by: Alexandru Ardelean <aa@ocedo.com>
|
||||
---
|
||||
squashfs-tools/pseudo.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c
|
||||
index f85fe60..83bfc97 100644
|
||||
--- a/squashfs-tools/pseudo.c
|
||||
+++ b/squashfs-tools/pseudo.c
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
+#include <sys/stat.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "pseudo.h"
|
||||
@ -1,6 +1,5 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit toolchain-funcs
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit toolchain-funcs
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DEB_VER="3"
|
||||
|
||||
DESCRIPTION="Tool for creating compressed filesystem type squashfs"
|
||||
HOMEPAGE="http://squashfs.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz
|
||||
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="lz4 lzma lzo xattr +xz"
|
||||
|
||||
RDEPEND="
|
||||
sys-libs/zlib
|
||||
!xz? ( !lzo? ( sys-libs/zlib ) )
|
||||
lz4? ( app-arch/lz4 )
|
||||
lzma? ( app-arch/xz-utils )
|
||||
lzo? ( dev-libs/lzo )
|
||||
xattr? ( sys-apps/attr )
|
||||
xz? ( app-arch/xz-utils )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}/squashfs${PV}/${PN}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${WORKDIR}"/debian/patches/*.patch
|
||||
epatch "${FILESDIR}"/${P}-sysmacros.patch
|
||||
epatch "${FILESDIR}"/${P}-aligned-data.patch
|
||||
}
|
||||
|
||||
use10() { usex $1 1 0 ; }
|
||||
|
||||
src_configure() {
|
||||
# set up make command line variables in EMAKE_SQUASHFS_CONF
|
||||
EMAKE_SQUASHFS_CONF=(
|
||||
LZMA_XZ_SUPPORT=$(use10 lzma)
|
||||
LZO_SUPPORT=$(use10 lzo)
|
||||
LZ4_SUPPORT=$(use10 lz4)
|
||||
XATTR_SUPPORT=$(use10 xattr)
|
||||
XZ_SUPPORT=$(use10 xz)
|
||||
)
|
||||
|
||||
tc-export CC
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake "${EMAKE_SQUASHFS_CONF[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin mksquashfs unsquashfs
|
||||
cd ..
|
||||
dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
|
||||
doman "${WORKDIR}"/debian/manpages/*.[0-9]
|
||||
}
|
||||
@ -1,9 +1,9 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils toolchain-funcs flag-o-matic
|
||||
inherit eutils flag-o-matic toolchain-funcs
|
||||
|
||||
DEB_VER="3"
|
||||
|
||||
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="debug lz4 lzma lzo static xattr +xz"
|
||||
|
||||
LIB_DEPEND="sys-libs/zlib[static-libs(+)]
|
||||
@ -38,11 +38,17 @@ src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-local-cve-fix.patch
|
||||
epatch "${FILESDIR}"/${P}-mem-overflow.patch
|
||||
epatch "${FILESDIR}"/${P}-xattrs.patch
|
||||
epatch "${FILESDIR}"/${P}-extmatch.patch
|
||||
epatch "${FILESDIR}"/${P}-musl.patch
|
||||
}
|
||||
|
||||
use10() { usex $1 1 0 ; }
|
||||
|
||||
src_configure() {
|
||||
# restore GNU89 inline semantics to
|
||||
# emit function symbols, bug 595290
|
||||
append-cflags -std=gnu89
|
||||
|
||||
# set up make command line variables in EMAKE_SQUASHFS_CONF
|
||||
EMAKE_SQUASHFS_CONF=(
|
||||
LZMA_XZ_SUPPORT=$(use10 lzma)
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Tool for creating compressed filesystem type squashfs"
|
||||
HOMEPAGE="http://squashfs.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="+xz lzma lz4 lzo xattr"
|
||||
|
||||
RDEPEND="
|
||||
sys-libs/zlib
|
||||
!xz? ( !lzo? ( sys-libs/zlib ) )
|
||||
lz4? ( app-arch/lz4 )
|
||||
lzma? ( app-arch/xz-utils )
|
||||
lzo? ( dev-libs/lzo )
|
||||
xattr? ( sys-apps/attr )
|
||||
xz? ( app-arch/xz-utils )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}/squashfs${PV}/${PN}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-sysmacros.patch
|
||||
}
|
||||
|
||||
use10() { usex $1 1 2 ; }
|
||||
|
||||
src_configure() {
|
||||
# set up make command line variables in EMAKE_SQUASHFS_CONF
|
||||
EMAKE_SQUASHFS_CONF=(
|
||||
LZMA_XZ_SUPPORT=$(use10 lzma)
|
||||
LZO_SUPPORT=$(use10 lzo)
|
||||
LZ4_SUPPORT=$(use10 lz4)
|
||||
XATTR_SUPPORT=$(use10 xattr)
|
||||
XZ_SUPPORT=$(use10 xz)
|
||||
)
|
||||
|
||||
tc-export CC
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake "${EMAKE_SQUASHFS_CONF[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin mksquashfs unsquashfs
|
||||
cd ..
|
||||
dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user