parent
888302f172
commit
ab3e5639b4
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=apparmor
|
||||
pkgver=3.0.6
|
||||
pkgver=3.0.7
|
||||
pkgrel=01
|
||||
pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM) w/o systemd"
|
||||
arch=(x86_64)
|
||||
|
|
@ -28,14 +28,13 @@ backup=('etc/apparmor/easyprof.conf'
|
|||
# LTO is currently still broken: https://gitlab.com/apparmor/apparmor/-/issues/214
|
||||
#options=(!lto)
|
||||
#options=(debug) ## uncomment this line to have the debug pkg produced
|
||||
source=(https://launchpad.net/$pkgname/${pkgver%.[0-9]}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc}
|
||||
$pkgname-3.0.6-python.patch)
|
||||
source=(https://launchpad.net/$pkgname/${pkgver%.[0-9]}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc})
|
||||
_core_perl="/usr/bin/core_perl"
|
||||
|
||||
prepare() {
|
||||
# fix issues with python-setuptools version detection: https://gitlab.com/apparmor/apparmor/-/issues/259
|
||||
# and hardcoded LDPATH/ PYTHONPATH https://gitlab.com/apparmor/apparmor/-/issues/39
|
||||
patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-3.0.6-python.patch
|
||||
# # fix issues with python-setuptools version detection: https://gitlab.com/apparmor/apparmor/-/issues/259
|
||||
# # and hardcoded LDPATH/ PYTHONPATH https://gitlab.com/apparmor/apparmor/-/issues/39
|
||||
# patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-3.0.6-python.patch
|
||||
|
||||
cd $pkgname-$pkgver/libraries/libapparmor/
|
||||
autoreconf -fiv
|
||||
|
|
@ -147,7 +146,5 @@ license=(GPL2 LGPL2.1)
|
|||
|
||||
validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB') # AppArmor Development Team (AppArmor signing key) <apparmor@lists.ubuntu.com>
|
||||
|
||||
sha256sums=(0f4c599ee4864e4e412e18133a3b5990f9f81ab6ba75f0f351f024bb722fa368 # apparmor-3.0.6.tar.gz
|
||||
438b2605aabe4cdbf2b23bfa7ff8e73fda98d601d5835d0166a59b5616064436 # apparmor-3.0.6.tar.gz.asc
|
||||
b3501f780becbd0fb26293503366968874484598a7ecc237be331009133208a0) # apparmor-3.0.6-python.patch
|
||||
|
||||
sha256sums=(f7063637d7523a28a59696f89e878d9942985bf828194d4c4bae594bec57e2d1 # apparmor-3.0.7.tar.gz
|
||||
383ff89c5744dfabd3e112460287edfadb8b8d792ac0a7da144fa9ce0e02dd3e) # apparmor-3.0.7.tar.gz.asc
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: David Runge <dvzrv@archlinux.org>
|
||||
|
||||
pkgname=apparmor
|
||||
pkgver=3.0.6
|
||||
pkgver=3.0.7
|
||||
pkgrel=1
|
||||
pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
|
||||
arch=(x86_64)
|
||||
|
|
@ -25,24 +25,15 @@ backup=(
|
|||
etc/apparmor/severity.db
|
||||
)
|
||||
options=(debug)
|
||||
source=(
|
||||
https://launchpad.net/$pkgname/${pkgver%.[0-9]}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc}
|
||||
$pkgname-3.0.6-python.patch
|
||||
)
|
||||
sha512sums=('e200b4d7f2214ac8d3c7fff57ccbaf2c4f5e3831c75287add974c7c3cd5cb70d632cda16043396b11b77ab661b097a3904c7851da79920b0caee13abc885dbef'
|
||||
'SKIP'
|
||||
'afea70b4406e948bce5cdd8b8d62d0dc9d30bca3861545a5a463ba2909c08f1110cb0c638d9f871c8e4451a22015ce037ca829c789a916175d32c7d9cfbf2232')
|
||||
b2sums=('6809f77d75283033971009d460476d0357344241f209d3d1eb9322d819182dc4196e12a070735196ef0e56a84dc3cf8c1786f9cf4615ed1b69b2d72a041ffbc4'
|
||||
'SKIP'
|
||||
'689038f910155d23a196a612e992d5e841de352305fab1e2b22d3efebaa31978d2bfdd999bfbd58db46e6dd68dcfd4e86a256fa87fe55ebd0f53067e004811f4')
|
||||
source=(https://launchpad.net/$pkgname/${pkgver%.[0-9]}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc})
|
||||
sha512sums=('6a3ba96dddcab623b91488eac21eba9441be437c3cd4e2c265fa6fa6711eb121340aec17710756809ded9b734e89d0ee2919ef1bff27343fb31c5cfaa33a77ed'
|
||||
'SKIP')
|
||||
b2sums=('340e8fc40f33b45f4e5d253bbaa3d48573da86a2d75220440d3ba5f80e8eacf47bfffdd3a305d3a99cd78a9fb2f6ee9cd2181e66c8e43549491c9fe07e609b42'
|
||||
'SKIP')
|
||||
validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB') # AppArmor Development Team (AppArmor signing key) <apparmor@lists.ubuntu.com>
|
||||
_core_perl="/usr/bin/core_perl"
|
||||
|
||||
prepare() {
|
||||
# fix issues with python-setuptools version detection: https://gitlab.com/apparmor/apparmor/-/issues/259
|
||||
# and hardcoded LDPATH/ PYTHONPATH https://gitlab.com/apparmor/apparmor/-/issues/39
|
||||
patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-3.0.6-python.patch
|
||||
|
||||
cd $pkgname-$pkgver/libraries/libapparmor/
|
||||
autoreconf -fiv
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,3 +11,5 @@ autoconf
|
|||
automake
|
||||
bison
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,20 +6,15 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=cmake
|
||||
pkgver=3.23.2
|
||||
pkgrel=02
|
||||
pkgver=3.24.0
|
||||
pkgrel=01
|
||||
pkgdesc='A cross-platform open-source make system'
|
||||
arch=('x86_64')
|
||||
url="https://www.cmake.org/"
|
||||
depends=('curl' 'libarchive' 'hicolor-icon-theme' 'jsoncpp' 'libuv' 'rhash')
|
||||
makedepends=( 'python-sphinx' 'emacs-git')
|
||||
optdepends=('qt6-base: cmake-gui')
|
||||
source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
|
||||
wxwidgets-3.2.patch)
|
||||
|
||||
prepare() {
|
||||
patch -d $pkgname-$pkgver -p1 < wxwidgets-3.2.patch # Support wxWidgets 3.2
|
||||
}
|
||||
source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
|
||||
|
||||
build() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
|
|
@ -49,7 +44,4 @@ package() {
|
|||
|
||||
license=('custom')
|
||||
|
||||
sha256sums=(f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa # cmake-3.23.2.tar.gz
|
||||
bd246e61a6afeebbc5cf5ccd282ee21c4320de04523145d3e27dd8a1efbf330d) # wxwidgets-3.2.patch
|
||||
|
||||
|
||||
sha256sums=(c2b61f7cdecb1576cad25f918a8f42b8685d88a832fd4b62b9e0fa32e915a658) # cmake-3.24.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
# Contributor: Pierre Schmitz <pierre@archlinux.de>
|
||||
|
||||
pkgname=cmake
|
||||
pkgver=3.23.2
|
||||
pkgrel=2
|
||||
pkgver=3.24.0
|
||||
pkgrel=1
|
||||
pkgdesc='A cross-platform open-source make system'
|
||||
arch=('x86_64')
|
||||
url="https://www.cmake.org/"
|
||||
|
|
@ -12,14 +12,8 @@ license=('custom')
|
|||
depends=('curl' 'libarchive' 'hicolor-icon-theme' 'jsoncpp' 'libjsoncpp.so' 'libuv' 'rhash')
|
||||
makedepends=('qt6-base' 'python-sphinx' 'emacs')
|
||||
optdepends=('qt6-base: cmake-gui')
|
||||
source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
|
||||
wxwidgets-3.2.patch)
|
||||
sha512sums=('0925adf973d642fd76d4089b61b3882babb0a85050c4c57d5f5f3bd6b17564a9feb0beed236cd636e25f69072fa30b67ea3f80932380b6b6576f2dd78b8e6931'
|
||||
'618a529fcd0a5029160fc6ef74439b7cb54ca74d13d52dd6cad005710bf1be263d0bf90bc4becc63a37929ac2f86c51278685e9da93fd82355ac646cb43b356f')
|
||||
|
||||
prepare() {
|
||||
patch -d $pkgname-$pkgver -p1 < wxwidgets-3.2.patch # Support wxWidgets 3.2
|
||||
}
|
||||
source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
|
||||
sha512sums=('91507fc0643f2de20e37cd8d6a539d8cb38a80b604bf77de8e88c8446b6d7b6d02b7329d58966dc2412c6c75edcb9dfbdae02fe84965fefeb7ca47f87631fe17')
|
||||
|
||||
build() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
License
|
||||
|
||||
Lua is free software distributed under the terms of the MIT license
|
||||
reproduced below; it may be used for any purpose, including commercial
|
||||
purposes, at absolutely no cost without having to ask us. The only
|
||||
requirement is that if you do use Lua, then you should give us credit
|
||||
by including the appropriate copyright notice somewhere in your
|
||||
product or its documentation.
|
||||
|
||||
Copyright © 1994–2015 Lua.org, PUC-Rio.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person
|
||||
obtaining a copy of this software and associated documentation
|
||||
files (the "Software"), to deal in the Software without
|
||||
restriction, including without limitation the rights to use, copy,
|
||||
modify, merge, publish, distribute, sublicense, and/or sell copies
|
||||
of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=lua
|
||||
pkgver=5.4.4
|
||||
_majorver=${pkgver%.*}
|
||||
pkgrel=02
|
||||
pkgdesc='Powerful lightweight programming language designed for extending applications'
|
||||
arch=('x86_64')
|
||||
url='https://www.lua.org/'
|
||||
depends=('readline')
|
||||
#options=('!emptydirs' 'debug')
|
||||
options=('!emptydirs')
|
||||
source=(https://www.lua.org/ftp/lua-$pkgver.tar.gz
|
||||
liblua.so.patch
|
||||
lua.pc
|
||||
LICENSE)
|
||||
|
||||
prepare() {
|
||||
cd lua-$pkgver
|
||||
patch -p1 -i ../liblua.so.patch
|
||||
|
||||
sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
|
||||
}
|
||||
|
||||
build() {
|
||||
cd lua-$pkgver
|
||||
|
||||
make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux-readline
|
||||
}
|
||||
|
||||
package() {
|
||||
cd lua-$pkgver
|
||||
|
||||
make \
|
||||
TO_LIB="liblua.a liblua.so liblua.so.$_majorver liblua.so.$pkgver" \
|
||||
INSTALL_DATA='cp -d' \
|
||||
INSTALL_TOP="$pkgdir"/usr \
|
||||
INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
|
||||
install
|
||||
ln -sf /usr/bin/lua "$pkgdir"/usr/bin/lua$_majorver
|
||||
ln -sf /usr/bin/luac "$pkgdir"/usr/bin/luac$_majorver
|
||||
ln -sf /usr/lib/liblua.so.$pkgver "$pkgdir"/usr/lib/liblua$_majorver.so
|
||||
|
||||
install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/lua54.pc
|
||||
ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc
|
||||
ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua5.4.pc
|
||||
ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua-5.4.pc
|
||||
|
||||
install -d "$pkgdir"/usr/share/doc/$pkgname
|
||||
install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname
|
||||
install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
|
||||
license=('MIT')
|
||||
|
||||
sha1sums=('03c27684b9d5d9783fb79a7c836ba1cdc5f309cd'
|
||||
'cdfa66057f43aaf4b5914496aa6a4556f3a6e7a0'
|
||||
'1aee8d1a219639d0efc534e483ffa1ee236fb393'
|
||||
'05f5f3b7bef0258bd617c505b8992de639af4551')
|
||||
|
||||
sha256sums=(164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61 # lua-5.4.4.tar.gz
|
||||
a8a7f89ab0c03b4bc1d58a935c54df792ad628edb4d1788c5ac66e4fc2d9f800 # liblua.so.patch
|
||||
ca9252633e782b8f85d6a94ea4f6babd4fe30bd759085b373160b1878e36ff78 # lua.pc
|
||||
142fb08b41a807b192b4b2c166696a1830a1c97967e5099ad0e579bf500e1da4) # LICENSE
|
||||
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
|
||||
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
|
||||
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
|
||||
|
||||
pkgname=lua
|
||||
pkgver=5.4.4
|
||||
_majorver=${pkgver%.*}
|
||||
pkgrel=2
|
||||
pkgdesc='Powerful lightweight programming language designed for extending applications'
|
||||
arch=('x86_64')
|
||||
url='https://www.lua.org/'
|
||||
depends=('readline')
|
||||
license=('MIT')
|
||||
options=('!emptydirs' 'debug')
|
||||
source=(https://www.lua.org/ftp/lua-$pkgver.tar.gz
|
||||
liblua.so.patch
|
||||
lua.pc
|
||||
LICENSE)
|
||||
sha1sums=('03c27684b9d5d9783fb79a7c836ba1cdc5f309cd'
|
||||
'cdfa66057f43aaf4b5914496aa6a4556f3a6e7a0'
|
||||
'1aee8d1a219639d0efc534e483ffa1ee236fb393'
|
||||
'05f5f3b7bef0258bd617c505b8992de639af4551')
|
||||
|
||||
prepare() {
|
||||
cd lua-$pkgver
|
||||
patch -p1 -i ../liblua.so.patch
|
||||
|
||||
sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
|
||||
}
|
||||
|
||||
build() {
|
||||
cd lua-$pkgver
|
||||
|
||||
make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux-readline
|
||||
}
|
||||
|
||||
package() {
|
||||
cd lua-$pkgver
|
||||
|
||||
make \
|
||||
TO_LIB="liblua.a liblua.so liblua.so.$_majorver liblua.so.$pkgver" \
|
||||
INSTALL_DATA='cp -d' \
|
||||
INSTALL_TOP="$pkgdir"/usr \
|
||||
INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
|
||||
install
|
||||
ln -sf /usr/bin/lua "$pkgdir"/usr/bin/lua$_majorver
|
||||
ln -sf /usr/bin/luac "$pkgdir"/usr/bin/luac$_majorver
|
||||
ln -sf /usr/lib/liblua.so.$pkgver "$pkgdir"/usr/lib/liblua$_majorver.so
|
||||
|
||||
install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/lua54.pc
|
||||
ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc
|
||||
ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua5.4.pc
|
||||
ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua-5.4.pc
|
||||
|
||||
install -d "$pkgdir"/usr/share/doc/$pkgname
|
||||
install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname
|
||||
install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 416f444..eeaff03 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -52,7 +52,7 @@ R= $V.0
|
||||
all: $(PLAT)
|
||||
|
||||
$(PLATS) help test clean:
|
||||
- @cd src && $(MAKE) $@
|
||||
+ @cd src && $(MAKE) $@ V=$(V) R=$(R)
|
||||
|
||||
install: dummy
|
||||
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 514593d..372a6dc 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -33,6 +33,7 @@ CMCFLAGS= -Os
|
||||
PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
|
||||
|
||||
LUA_A= liblua.a
|
||||
+LUA_SO= liblua.so
|
||||
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
|
||||
LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
|
||||
BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
|
||||
@@ -44,7 +45,7 @@ LUAC_T= luac
|
||||
LUAC_O= luac.o
|
||||
|
||||
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
|
||||
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
||||
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
|
||||
ALL_A= $(LUA_A)
|
||||
|
||||
# Targets start here.
|
||||
@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O)
|
||||
$(AR) $@ $(BASE_O)
|
||||
$(RANLIB) $@
|
||||
|
||||
+$(LUA_SO): $(CORE_O) $(LIB_O)
|
||||
+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
|
||||
+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
|
||||
+ ln -sf $(LUA_SO).$(R) $(LUA_SO)
|
||||
+
|
||||
+
|
||||
$(LUA_T): $(LUA_O) $(LUA_A)
|
||||
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
||||
|
||||
diff --git a/src/luaconf.h b/src/luaconf.h
|
||||
index bdf927e..7e15198 100644
|
||||
--- a/src/luaconf.h
|
||||
+++ b/src/luaconf.h
|
||||
@@ -227,7 +227,7 @@
|
||||
|
||||
#else /* }{ */
|
||||
|
||||
-#define LUA_ROOT "/usr/local/"
|
||||
+#define LUA_ROOT "/usr/"
|
||||
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
|
||||
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
V=%VER%
|
||||
R=%REL%
|
||||
|
||||
prefix=/usr
|
||||
INSTALL_BIN=${prefix}/bin
|
||||
INSTALL_INC=${prefix}/include
|
||||
INSTALL_LIB=${prefix}/lib
|
||||
INSTALL_MAN=${prefix}/man/man1
|
||||
INSTALL_LMOD=${prefix}/share/lua/${V}
|
||||
INSTALL_CMOD=${prefix}/lib/lua/${V}
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: Lua
|
||||
Description: An Extensible Extension Language
|
||||
Version: ${R}
|
||||
Requires:
|
||||
Libs: -L${libdir} -llua -lm
|
||||
Cflags: -I${includedir}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
real 0m8.531s
|
||||
user 0m2.511s
|
||||
sys 0m0.363s
|
||||
|
||||
|
|
@ -6,9 +6,9 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=rsync
|
||||
_tag='db2a0aed76cfedeb87179017167c29cc2ab7a1e8' # git rev-parse v${pkgver}
|
||||
pkgver=3.2.4
|
||||
pkgrel=02
|
||||
_tag='1bb1c21c8ffce4ea922972ce4060eb72c6a4481b' # git rev-parse v${pkgver}
|
||||
pkgver=3.2.5pre2
|
||||
pkgrel=01
|
||||
pkgdesc='A fast and versatile file copying tool for remote and local files w/o systemd zstd ipv6'
|
||||
arch=('x86_64')
|
||||
url='https://rsync.samba.org/'
|
||||
|
|
@ -17,13 +17,14 @@ depends=('acl' 'libacl.so' 'lz4' 'openssl' 'perl' 'popt' 'xxhash' 'libxxhash.so'
|
|||
makedepends=('git' 'python-commonmark')
|
||||
backup=('etc/rsyncd.conf'
|
||||
'etc/xinetd.d/rsync')
|
||||
#options=('debug') ### uncomment this to have the debug pkg produced
|
||||
source=("git+https://github.com/WayneD/rsync#tag=${_tag}?signed"
|
||||
'rsyncd.conf')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/rsync"
|
||||
|
||||
git show 'b7231c7d02cfb65d291af74ff66e7d8c507ee871' | git apply --exclude='rsync.1.md'
|
||||
git merge --ff-only 'cff8f044776c5143a5b270969d4bb0f1fea8b017'
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -62,3 +63,5 @@ validpgpkeys=(0048C8B026D4C96F0E589C2F6C859FB14B96A8C5) # Wayne Davison <wayned@
|
|||
|
||||
sha256sums=(SKIP
|
||||
733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b) # rsyncd.conf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Maintainer: Christian Hesse <mail@eworm.de>
|
||||
|
||||
pkgname=rsync
|
||||
_tag='db2a0aed76cfedeb87179017167c29cc2ab7a1e8' # git rev-parse v${pkgver}
|
||||
pkgver=3.2.4
|
||||
pkgrel=2
|
||||
_tag='1bb1c21c8ffce4ea922972ce4060eb72c6a4481b' # git rev-parse v${pkgver}
|
||||
pkgver=3.2.5pre2
|
||||
pkgrel=1
|
||||
pkgdesc='A fast and versatile file copying tool for remote and local files'
|
||||
arch=('x86_64')
|
||||
url='https://rsync.samba.org/'
|
||||
|
|
@ -11,6 +11,7 @@ license=('GPL3')
|
|||
depends=('acl' 'libacl.so' 'lz4' 'openssl' 'perl' 'popt' 'xxhash' 'libxxhash.so'
|
||||
'zlib' 'zstd')
|
||||
makedepends=('git' 'python-commonmark')
|
||||
options=('debug')
|
||||
backup=('etc/rsyncd.conf'
|
||||
'etc/xinetd.d/rsync')
|
||||
validpgpkeys=('0048C8B026D4C96F0E589C2F6C859FB14B96A8C5') # Wayne Davison <wayned@users.sourceforge.net>
|
||||
|
|
@ -22,7 +23,7 @@ sha256sums=('SKIP'
|
|||
prepare() {
|
||||
cd "$srcdir/rsync"
|
||||
|
||||
git show 'b7231c7d02cfb65d291af74ff66e7d8c507ee871' | git apply --exclude='rsync.1.md'
|
||||
git merge --ff-only 'cff8f044776c5143a5b270969d4bb0f1fea8b017'
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -5,3 +5,4 @@ python-commonmark
|
|||
automake
|
||||
autoconf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,173 @@
|
|||
From: Steven M. Schweda <sms@antinode.info>
|
||||
Subject: Fix for CVE-2022-0529 and CVE-2022-0530
|
||||
Bug-Debian: https://bugs.debian.org/1010355
|
||||
X-Debian-version: 6.0-27
|
||||
|
||||
--- a/fileio.c
|
||||
+++ b/fileio.c
|
||||
@@ -171,8 +171,10 @@
|
||||
static ZCONST char Far FilenameTooLongTrunc[] =
|
||||
"warning: filename too long--truncating.\n";
|
||||
#ifdef UNICODE_SUPPORT
|
||||
+ static ZCONST char Far UFilenameCorrupt[] =
|
||||
+ "error: Unicode filename corrupt.\n";
|
||||
static ZCONST char Far UFilenameTooLongTrunc[] =
|
||||
- "warning: Converted unicode filename too long--truncating.\n";
|
||||
+ "warning: Converted Unicode filename too long--truncating.\n";
|
||||
#endif
|
||||
static ZCONST char Far ExtraFieldTooLong[] =
|
||||
"warning: extra field too long (%d). Ignoring...\n";
|
||||
@@ -2361,16 +2363,30 @@
|
||||
/* convert UTF-8 to local character set */
|
||||
fn = utf8_to_local_string(G.unipath_filename,
|
||||
G.unicode_escape_all);
|
||||
- /* make sure filename is short enough */
|
||||
- if (strlen(fn) >= FILNAMSIZ) {
|
||||
- fn[FILNAMSIZ - 1] = '\0';
|
||||
+
|
||||
+ /* 2022-07-22 SMS, et al. CVE-2022-0530
|
||||
+ * Detect conversion failure, emit message.
|
||||
+ * Continue with unconverted name.
|
||||
+ */
|
||||
+ if (fn == NULL)
|
||||
+ {
|
||||
Info(slide, 0x401, ((char *)slide,
|
||||
- LoadFarString(UFilenameTooLongTrunc)));
|
||||
- error = PK_WARN;
|
||||
+ LoadFarString(UFilenameCorrupt)));
|
||||
+ error = PK_ERR;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ /* make sure filename is short enough */
|
||||
+ if (strlen(fn) >= FILNAMSIZ) {
|
||||
+ fn[FILNAMSIZ - 1] = '\0';
|
||||
+ Info(slide, 0x401, ((char *)slide,
|
||||
+ LoadFarString(UFilenameTooLongTrunc)));
|
||||
+ error = PK_WARN;
|
||||
+ }
|
||||
+ /* replace filename with converted UTF-8 */
|
||||
+ strcpy(G.filename, fn);
|
||||
+ free(fn);
|
||||
}
|
||||
- /* replace filename with converted UTF-8 */
|
||||
- strcpy(G.filename, fn);
|
||||
- free(fn);
|
||||
}
|
||||
# endif /* UNICODE_WCHAR */
|
||||
if (G.unipath_filename != G.filename_full)
|
||||
--- a/process.c
|
||||
+++ b/process.c
|
||||
@@ -222,6 +222,8 @@
|
||||
"\nwarning: Unicode Path version > 1\n";
|
||||
static ZCONST char Far UnicodeMismatchError[] =
|
||||
"\nwarning: Unicode Path checksum invalid\n";
|
||||
+ static ZCONST char Far UFilenameTooLongTrunc[] =
|
||||
+ "warning: filename too long (P1) -- truncating.\n";
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1915,7 +1917,7 @@
|
||||
Sets both local header and central header fields. Not terribly clever,
|
||||
but it means that this procedure is only called in one place.
|
||||
|
||||
- 2014-12-05 SMS.
|
||||
+ 2014-12-05 SMS. (oCERT.org report.) CVE-2014-8141.
|
||||
Added checks to ensure that enough data are available before calling
|
||||
makeint64() or makelong(). Replaced various sizeof() values with
|
||||
simple ("4" or "8") constants. (The Zip64 structures do not depend
|
||||
@@ -1947,9 +1949,10 @@
|
||||
ef_len - EB_HEADSIZE));
|
||||
break;
|
||||
}
|
||||
+
|
||||
if (eb_id == EF_PKSZ64)
|
||||
{
|
||||
- int offset = EB_HEADSIZE;
|
||||
+ unsigned offset = EB_HEADSIZE;
|
||||
|
||||
if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL))
|
||||
{
|
||||
@@ -2046,7 +2049,7 @@
|
||||
}
|
||||
if (eb_id == EF_UNIPATH) {
|
||||
|
||||
- int offset = EB_HEADSIZE;
|
||||
+ unsigned offset = EB_HEADSIZE;
|
||||
ush ULen = eb_len - 5;
|
||||
ulg chksum = CRCVAL_INITIAL;
|
||||
|
||||
@@ -2504,16 +2507,17 @@
|
||||
int state_dependent;
|
||||
int wsize = 0;
|
||||
int max_bytes = MB_CUR_MAX;
|
||||
- char buf[9];
|
||||
+ char buf[ MB_CUR_MAX+ 1]; /* ("+1" not really needed?) */
|
||||
char *buffer = NULL;
|
||||
char *local_string = NULL;
|
||||
+ size_t buffer_size; /* CVE-2022-0529 */
|
||||
|
||||
for (wsize = 0; wide_string[wsize]; wsize++) ;
|
||||
|
||||
if (max_bytes < MAX_ESCAPE_BYTES)
|
||||
max_bytes = MAX_ESCAPE_BYTES;
|
||||
-
|
||||
- if ((buffer = (char *)malloc(wsize * max_bytes + 1)) == NULL) {
|
||||
+ buffer_size = wsize * max_bytes + 1; /* Reused below. */
|
||||
+ if ((buffer = (char *)malloc( buffer_size)) == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -2551,8 +2555,28 @@
|
||||
} else {
|
||||
/* no MB for this wide */
|
||||
/* use escape for wide character */
|
||||
- char *escape_string = wide_to_escape_string(wide_string[i]);
|
||||
- strcat(buffer, escape_string);
|
||||
+ size_t buffer_len;
|
||||
+ size_t escape_string_len;
|
||||
+ char *escape_string;
|
||||
+ int err_msg = 0;
|
||||
+
|
||||
+ escape_string = wide_to_escape_string(wide_string[i]);
|
||||
+ buffer_len = strlen( buffer);
|
||||
+ escape_string_len = strlen( escape_string);
|
||||
+
|
||||
+ /* Append escape string, as space allows. */
|
||||
+ /* 2022-07-18 SMS, et al. CVE-2022-0529 */
|
||||
+ if (escape_string_len > buffer_size- buffer_len- 1)
|
||||
+ {
|
||||
+ escape_string_len = buffer_size- buffer_len- 1;
|
||||
+ if (err_msg == 0)
|
||||
+ {
|
||||
+ err_msg = 1;
|
||||
+ Info(slide, 0x401, ((char *)slide,
|
||||
+ LoadFarString( UFilenameTooLongTrunc)));
|
||||
+ }
|
||||
+ }
|
||||
+ strncat( buffer, escape_string, escape_string_len);
|
||||
free(escape_string);
|
||||
}
|
||||
}
|
||||
@@ -2604,9 +2628,18 @@
|
||||
ZCONST char *utf8_string;
|
||||
int escape_all;
|
||||
{
|
||||
- zwchar *wide = utf8_to_wide_string(utf8_string);
|
||||
- char *loc = wide_to_local_string(wide, escape_all);
|
||||
- free(wide);
|
||||
+ zwchar *wide;
|
||||
+ char *loc = NULL;
|
||||
+
|
||||
+ wide = utf8_to_wide_string( utf8_string);
|
||||
+
|
||||
+ /* 2022-07-25 SMS, et al. CVE-2022-0530 */
|
||||
+ if (wide != NULL)
|
||||
+ {
|
||||
+ loc = wide_to_local_string( wide, escape_all);
|
||||
+ free( wide);
|
||||
+ }
|
||||
+
|
||||
return loc;
|
||||
}
|
||||
|
||||
|
|
@ -8,11 +8,12 @@
|
|||
pkgname=unzip
|
||||
pkgver=6.0
|
||||
_pkgver=${pkgver/./}
|
||||
pkgrel=018
|
||||
pkgrel=019
|
||||
pkgdesc='For extracting and viewing files in .zip archives'
|
||||
url='http://infozip.sourceforge.net/UnZip.html'
|
||||
arch=('x86_64')
|
||||
depends=('bzip2' 'bash')
|
||||
#options=('debug') ### uncomment this to have the debug pkg produced
|
||||
source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-exec-shield.patch'
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-close.patch'
|
||||
|
|
@ -42,7 +43,8 @@ source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
|
|||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-zipbomb-part5.patch'
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-zipbomb-part6.patch'
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-zipbomb-switch.patch'
|
||||
'unzip-6.0_CVE-2021-4217.patch')
|
||||
'unzip-6.0_CVE-2021-4217.patch'
|
||||
'https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}${_pkgver}"
|
||||
|
|
@ -76,6 +78,7 @@ prepare() {
|
|||
patch -p1 -i ../unzip-zipbomb-part6.patch
|
||||
patch -p1 -i ../unzip-zipbomb-switch.patch
|
||||
patch -p1 -i ../unzip-6.0_CVE-2021-4217.patch # FS#73542
|
||||
patch -p1 -F3 -i ../28-cve-2022-0529-and-cve-2022-0530.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -100,7 +103,9 @@ package() {
|
|||
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
|
||||
license=('custom')
|
||||
|
||||
sha512sums=('0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d'
|
||||
'3c7f525687b198aaa8547a8b30e744f7f184943624279d5c70170d5b9bb3f0c0f27f3e69bc808dd0d144690107bc76a10c06e160bf99c54fd5684246208b7cff'
|
||||
'8423e32bbc1e1fe9366118bd10795bb8307f5a9a1afba1f0f62e46443d198b7f3cfcc41dedf57f31830f4c7328c9f5ae573982ca8664822b5f2a2ecdbc389df9'
|
||||
|
|
@ -130,35 +135,38 @@ sha512sums=('0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0
|
|||
'48875d7e08d669637e26a7e800f8b2a3812d477e6f249c8d4962fdf93ba6d346f5b22b83d82cb65317b506dff84c441d42c0fe7d1c042a065619d39bdf25fdd0'
|
||||
'a788d57fe0fb9ae6106381d2a8fe566aa35bb037012139dc7c283fe5eb316056835dffa9ea9778c15a5b39e50a75329a135a0dffdfc6a53d575ef2013b1d478a'
|
||||
'd86aba51101fdbe855c35f034d33d65a79c5c707d01de4709619f5d1316185777048b72c293f9506186677bcecf54a808e106ad59bb36835ef80615641c85d63'
|
||||
'fc1f4246b6974c3c554aed1127f512f0b2ac8fa13aff7c3b54877411e15856522e35633c45b2326d96b5094a9106d697a0883c1879af2c616d9dd51180b6887b')
|
||||
'fc1f4246b6974c3c554aed1127f512f0b2ac8fa13aff7c3b54877411e15856522e35633c45b2326d96b5094a9106d697a0883c1879af2c616d9dd51180b6887b'
|
||||
bff17d21399a2189ed497602a735eab55746a17e6d414d843068c0374ae09d8d5958c00731e9f35dbfbce6ec9f802cb83d1e7436363392a36a2e34b724d0d71c) # 28-cve-2022-0529-and-cve-2022-0530.patch
|
||||
|
||||
sha256sums=(036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 # unzip60.tar.gz
|
||||
2c55be12907c42a454b91f53de92470d4f5d52e9ba7b0eef79684bd58efd4a1e # unzip-6.0-exec-shield.patch
|
||||
10754a10be46ee8e7b9f84935e7f2087a99abd0a00dff77f97181c8fd71e0eef # unzip-6.0-close.patch
|
||||
74bc961e8013a4058687a3730590a709b7889203beb74a4a8369ba0301bef0e2 # unzip-6.0-attribs-overflow.patch
|
||||
fde8f9d6dbc5e9dc59f4497de8e4e313fd74318eaf5f33421acd74442fd10706 # unzip-6.0-symlink.patch
|
||||
8d9426bdd98cbba00c2d2e36c1dae17da069e6c85bf35811a434a8cbe704e6f4 # unzip-6.0-format-secure.patch
|
||||
da042334a1ae4a37ea0317ff27cee9eadd0af1529bd8391cde34467a377a4068 # unzip-6.0-valgrind.patch
|
||||
3007d6995eeec7fce12a41b4d37ef309ffe74cae86f952071e4653a1751f0190 # unzip-6.0-x-option.patch
|
||||
c9a863e570bdaf2637c43bf1bba3d97808a1b0504d85418f6a8550ac286788f2 # unzip-6.0-overflow.patch
|
||||
337131428f491b7030f96ee5b8ef3d8f5963730d1619b2754c624f4616d79adb # unzip-6.0-cve-2014-8139.patch
|
||||
64f64985270e026c01d2c19c6b66c218cf5bcfc7cf3d4a44e601fad41975ec73 # unzip-6.0-cve-2014-8140.patch
|
||||
b7a14c33db93d1e5b4fc6ce113b4b99ff7a81ed56f46c87e001f22ec085e0273 # unzip-6.0-cve-2014-8141.patch
|
||||
251d5755ffb1e9701434c545fcda0fbfc2a16372f9d807fd07606b1364a1b55b # unzip-6.0-overflow-long-fsize.patch
|
||||
b6f64d7b57e74ceaa794dd13a6937f063ec915343f3d5d88b0f81c919e7bf171 # unzip-6.0-heap-overflow-infloop.patch
|
||||
e64c9ddb38c2e7d08bdb80c597f32ee960e18fbe8cb982e444b1ece03ac95cec # unzip-6.0-alt-iconv-utf8.patch
|
||||
b990d8d8d8e02777999484a132170666ea736a865f9ad81da651dc63725475ff # unzip-6.0-alt-iconv-utf8-print.patch
|
||||
7d8e5c77ad99f9bf56d4cbf224b5635367feb44f81745dec84b44365f8f5eb16 # 0001-Fix-CVE-2016-9844-rhbz-1404283.patch
|
||||
ea04cfc8b7ca3b3c03117da0d891870b8c542d26188ef5593fd7e479f4f29f4e # unzip-6.0-timestamp.patch
|
||||
aced0f27191a67f9b8b3fdc5995938a64fd87cea64a0bbba2106e06137ef91c2 # unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
|
||||
47e9deff12845e71de98cd19506a51c21d756a61bb67c0b17e77b84bdbe9fb84 # unzip-6.0-cve-2018-18384.patch
|
||||
866b8fc05731e4cf72f948c9540c3eb8b2372bf320442456b5b3ae9b74f0827c # unzip-6.0-COVSCAN-fix-unterminated-string.patch
|
||||
24582ff3dcd926d1a46caf8506f76999d2525dd66e36f50b25dca50799695f12 # unzip-zipbomb-part1.patch
|
||||
f88b9d4119a1e256f3335a2d2c142dd95d13d7c5f9e5ecd4371e547249f3557c # unzip-zipbomb-part2.patch
|
||||
ee9e26018190a515572b66a26118916843aa1002131a86b5c52769dc663b7acb # unzip-zipbomb-part3.patch
|
||||
ec4a8e5745e37f3d2d57c594c610b71753b77c5fb4bd92edfb0fb25ef968d13e # unzip-zipbomb-manpage.patch
|
||||
179330daaf395b631025d23ec666c227707caa8859a872cc39d3ea0e2a645e97 # unzip-zipbomb-part4.patch
|
||||
44599c80ea507c1fcfb8fb58b4c9d8d18f3157de453c1e0469a703322deb042a # unzip-zipbomb-part5.patch
|
||||
81ca46cfd3cf732de8cf78c57790ed7d5c73a5e8d41943b8f6313cede6004f3e # unzip-zipbomb-part6.patch
|
||||
59c0983b53801d3080684bc616d3570ccacfe471f3a8c442916b87f2f3bfa334 # unzip-zipbomb-switch.patch
|
||||
cb88ba5a2c9bdffd5867206a48841f638e2a7970e88cc009b90202bdca988b8b) # unzip-6.0_CVE-2021-4217.patch
|
||||
2c55be12907c42a454b91f53de92470d4f5d52e9ba7b0eef79684bd58efd4a1e # unzip-6.0-exec-shield.patch
|
||||
10754a10be46ee8e7b9f84935e7f2087a99abd0a00dff77f97181c8fd71e0eef # unzip-6.0-close.patch
|
||||
74bc961e8013a4058687a3730590a709b7889203beb74a4a8369ba0301bef0e2 # unzip-6.0-attribs-overflow.patch
|
||||
fde8f9d6dbc5e9dc59f4497de8e4e313fd74318eaf5f33421acd74442fd10706 # unzip-6.0-symlink.patch
|
||||
8d9426bdd98cbba00c2d2e36c1dae17da069e6c85bf35811a434a8cbe704e6f4 # unzip-6.0-format-secure.patch
|
||||
da042334a1ae4a37ea0317ff27cee9eadd0af1529bd8391cde34467a377a4068 # unzip-6.0-valgrind.patch
|
||||
3007d6995eeec7fce12a41b4d37ef309ffe74cae86f952071e4653a1751f0190 # unzip-6.0-x-option.patch
|
||||
c9a863e570bdaf2637c43bf1bba3d97808a1b0504d85418f6a8550ac286788f2 # unzip-6.0-overflow.patch
|
||||
337131428f491b7030f96ee5b8ef3d8f5963730d1619b2754c624f4616d79adb # unzip-6.0-cve-2014-8139.patch
|
||||
64f64985270e026c01d2c19c6b66c218cf5bcfc7cf3d4a44e601fad41975ec73 # unzip-6.0-cve-2014-8140.patch
|
||||
b7a14c33db93d1e5b4fc6ce113b4b99ff7a81ed56f46c87e001f22ec085e0273 # unzip-6.0-cve-2014-8141.patch
|
||||
251d5755ffb1e9701434c545fcda0fbfc2a16372f9d807fd07606b1364a1b55b # unzip-6.0-overflow-long-fsize.patch
|
||||
b6f64d7b57e74ceaa794dd13a6937f063ec915343f3d5d88b0f81c919e7bf171 # unzip-6.0-heap-overflow-infloop.patch
|
||||
e64c9ddb38c2e7d08bdb80c597f32ee960e18fbe8cb982e444b1ece03ac95cec # unzip-6.0-alt-iconv-utf8.patch
|
||||
b990d8d8d8e02777999484a132170666ea736a865f9ad81da651dc63725475ff # unzip-6.0-alt-iconv-utf8-print.patch
|
||||
7d8e5c77ad99f9bf56d4cbf224b5635367feb44f81745dec84b44365f8f5eb16 # 0001-Fix-CVE-2016-9844-rhbz-1404283.patch
|
||||
ea04cfc8b7ca3b3c03117da0d891870b8c542d26188ef5593fd7e479f4f29f4e # unzip-6.0-timestamp.patch
|
||||
aced0f27191a67f9b8b3fdc5995938a64fd87cea64a0bbba2106e06137ef91c2 # unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
|
||||
47e9deff12845e71de98cd19506a51c21d756a61bb67c0b17e77b84bdbe9fb84 # unzip-6.0-cve-2018-18384.patch
|
||||
866b8fc05731e4cf72f948c9540c3eb8b2372bf320442456b5b3ae9b74f0827c # unzip-6.0-COVSCAN-fix-unterminated-string.patch
|
||||
24582ff3dcd926d1a46caf8506f76999d2525dd66e36f50b25dca50799695f12 # unzip-zipbomb-part1.patch
|
||||
f88b9d4119a1e256f3335a2d2c142dd95d13d7c5f9e5ecd4371e547249f3557c # unzip-zipbomb-part2.patch
|
||||
ee9e26018190a515572b66a26118916843aa1002131a86b5c52769dc663b7acb # unzip-zipbomb-part3.patch
|
||||
ec4a8e5745e37f3d2d57c594c610b71753b77c5fb4bd92edfb0fb25ef968d13e # unzip-zipbomb-manpage.patch
|
||||
179330daaf395b631025d23ec666c227707caa8859a872cc39d3ea0e2a645e97 # unzip-zipbomb-part4.patch
|
||||
44599c80ea507c1fcfb8fb58b4c9d8d18f3157de453c1e0469a703322deb042a # unzip-zipbomb-part5.patch
|
||||
81ca46cfd3cf732de8cf78c57790ed7d5c73a5e8d41943b8f6313cede6004f3e # unzip-zipbomb-part6.patch
|
||||
59c0983b53801d3080684bc616d3570ccacfe471f3a8c442916b87f2f3bfa334 # unzip-zipbomb-switch.patch
|
||||
cb88ba5a2c9bdffd5867206a48841f638e2a7970e88cc009b90202bdca988b8b # unzip-6.0_CVE-2021-4217.patch
|
||||
a27efd8c4950fb3d942d602ad7846996e02aafd77a8ad1e26700e42ae6c1cd37) # 28-cve-2022-0529-and-cve-2022-0530.patch
|
||||
|
||||
|
|
|
|||
|
|
@ -6,12 +6,13 @@
|
|||
pkgname=unzip
|
||||
pkgver=6.0
|
||||
_pkgver=${pkgver/./}
|
||||
pkgrel=18
|
||||
pkgrel=19
|
||||
pkgdesc='For extracting and viewing files in .zip archives'
|
||||
url='http://infozip.sourceforge.net/UnZip.html'
|
||||
arch=('x86_64')
|
||||
license=('custom')
|
||||
depends=('bzip2' 'bash')
|
||||
options=('debug')
|
||||
source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-exec-shield.patch'
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-close.patch'
|
||||
|
|
@ -41,7 +42,8 @@ source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
|
|||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-zipbomb-part5.patch'
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-zipbomb-part6.patch'
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-zipbomb-switch.patch'
|
||||
'unzip-6.0_CVE-2021-4217.patch')
|
||||
'unzip-6.0_CVE-2021-4217.patch'
|
||||
'https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch')
|
||||
sha512sums=('0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d'
|
||||
'3c7f525687b198aaa8547a8b30e744f7f184943624279d5c70170d5b9bb3f0c0f27f3e69bc808dd0d144690107bc76a10c06e160bf99c54fd5684246208b7cff'
|
||||
'8423e32bbc1e1fe9366118bd10795bb8307f5a9a1afba1f0f62e46443d198b7f3cfcc41dedf57f31830f4c7328c9f5ae573982ca8664822b5f2a2ecdbc389df9'
|
||||
|
|
@ -71,7 +73,8 @@ sha512sums=('0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0
|
|||
'48875d7e08d669637e26a7e800f8b2a3812d477e6f249c8d4962fdf93ba6d346f5b22b83d82cb65317b506dff84c441d42c0fe7d1c042a065619d39bdf25fdd0'
|
||||
'a788d57fe0fb9ae6106381d2a8fe566aa35bb037012139dc7c283fe5eb316056835dffa9ea9778c15a5b39e50a75329a135a0dffdfc6a53d575ef2013b1d478a'
|
||||
'd86aba51101fdbe855c35f034d33d65a79c5c707d01de4709619f5d1316185777048b72c293f9506186677bcecf54a808e106ad59bb36835ef80615641c85d63'
|
||||
'fc1f4246b6974c3c554aed1127f512f0b2ac8fa13aff7c3b54877411e15856522e35633c45b2326d96b5094a9106d697a0883c1879af2c616d9dd51180b6887b')
|
||||
'fc1f4246b6974c3c554aed1127f512f0b2ac8fa13aff7c3b54877411e15856522e35633c45b2326d96b5094a9106d697a0883c1879af2c616d9dd51180b6887b'
|
||||
'bff17d21399a2189ed497602a735eab55746a17e6d414d843068c0374ae09d8d5958c00731e9f35dbfbce6ec9f802cb83d1e7436363392a36a2e34b724d0d71c')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}${_pkgver}"
|
||||
|
|
@ -105,6 +108,7 @@ prepare() {
|
|||
patch -p1 -i ../unzip-zipbomb-part6.patch
|
||||
patch -p1 -i ../unzip-zipbomb-switch.patch
|
||||
patch -p1 -i ../unzip-6.0_CVE-2021-4217.patch # FS#73542
|
||||
patch -p1 -F3 -i ../28-cve-2022-0529-and-cve-2022-0530.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,61 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=xkeyboard-config
|
||||
pkgver=2.36
|
||||
pkgrel=03
|
||||
pkgdesc="X keyboard configuration files"
|
||||
arch=(any)
|
||||
url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
|
||||
makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson')
|
||||
provides=('xkbdata')
|
||||
replaces=('xkbdata')
|
||||
conflicts=('xkbdata')
|
||||
source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
|
||||
alujiskeys.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/dc1534b4b0cf2153e4b8848310efc8393fb73830.patch
|
||||
backslahes-instead-of-slashes.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/8ac41c50ab0aa7cd3a7e94313074115de2a172d2.patch)
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
# FS##75007 / https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/325
|
||||
patch -Np1 -i ../alujiskeys.patch
|
||||
patch -Np1 -i ../backslahes-instead-of-slashes.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
arch-meson ${pkgname}-${pkgver} build \
|
||||
-D xkb-base="/usr/share/X11/xkb" \
|
||||
-D compat-rules=true \
|
||||
-D xorg-rules-symlinks=true
|
||||
|
||||
# Print config
|
||||
meson configure build
|
||||
|
||||
ninja -C build
|
||||
|
||||
}
|
||||
|
||||
package() {
|
||||
|
||||
DESTDIR="$pkgdir" ninja -C build install
|
||||
|
||||
install -m755 -d "${pkgdir}/var/lib/xkb"
|
||||
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
|
||||
license=('custom')
|
||||
|
||||
validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov@gmail.com>
|
||||
#validpgpkeys=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu@gnome.org>"
|
||||
|
||||
sha256sums=(1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595 # xkeyboard-config-2.36.tar.xz
|
||||
340382d3d7f90f6457ee1de73e0fc0c0ff32d01fb4fce601a29f99f6e1d7704d # xkeyboard-config-2.36.tar.xz.sig
|
||||
e3ae0fedc48ff32e707372efa211d06620bec8b58b0cca5f1eb991639b2867b8 # alujiskeys.patch
|
||||
7a16283051c6bba396ebd81756e02a5c185566f1b843456afa80876155140c14) # backslahes-instead-of-slashes.patch
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
|
||||
|
||||
pkgname=xkeyboard-config
|
||||
pkgver=2.36
|
||||
pkgrel=3
|
||||
pkgdesc="X keyboard configuration files"
|
||||
arch=(any)
|
||||
license=('custom')
|
||||
url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
|
||||
makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson')
|
||||
provides=('xkbdata')
|
||||
replaces=('xkbdata')
|
||||
conflicts=('xkbdata')
|
||||
source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
|
||||
alujiskeys.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/dc1534b4b0cf2153e4b8848310efc8393fb73830.patch
|
||||
backslahes-instead-of-slashes.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/8ac41c50ab0aa7cd3a7e94313074115de2a172d2.patch)
|
||||
validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov@gmail.com>
|
||||
#validpgpkeys=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu@gnome.org>"
|
||||
sha256sums=('1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP')
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
# FS##75007 / https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/325
|
||||
patch -Np1 -i ../alujiskeys.patch
|
||||
patch -Np1 -i ../backslahes-instead-of-slashes.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
arch-meson ${pkgname}-${pkgver} build \
|
||||
-D xkb-base="/usr/share/X11/xkb" \
|
||||
-D compat-rules=true \
|
||||
-D xorg-rules-symlinks=true
|
||||
|
||||
# Print config
|
||||
meson configure build
|
||||
|
||||
ninja -C build
|
||||
|
||||
}
|
||||
|
||||
package() {
|
||||
|
||||
DESTDIR="$pkgdir" ninja -C build install
|
||||
|
||||
install -m755 -d "${pkgdir}/var/lib/xkb"
|
||||
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
|
||||
}
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From dc1534b4b0cf2153e4b8848310efc8393fb73830 Mon Sep 17 00:00:00 2001
|
||||
From: Benno Schulenberg <bensberg@telfort.nl>
|
||||
Date: Sun, 12 Jun 2022 12:05:20 +0200
|
||||
Subject: [PATCH] rules: remove two rules that reference two sections that were
|
||||
deleted
|
||||
|
||||
Commit fe36f31e8c from three months ago removed the need for special
|
||||
aliases and key assignments for applealu_jis keyboards but forgot to
|
||||
remove the two rules that reference these sections.
|
||||
|
||||
This fixes issue #325.
|
||||
|
||||
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
|
||||
---
|
||||
rules/0004-evdev.m_k.part | 1 -
|
||||
rules/0026-evdev.m_s.part | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/rules/0004-evdev.m_k.part b/rules/0004-evdev.m_k.part
|
||||
index 1cff7b2f..62c21ffc 100644
|
||||
--- a/rules/0004-evdev.m_k.part
|
||||
+++ b/rules/0004-evdev.m_k.part
|
||||
@@ -1,5 +1,4 @@
|
||||
! model = keycodes
|
||||
- applealu_jis = evdev+macintosh(jisevdev)
|
||||
$jollamodels = evdev+jolla(jolla)
|
||||
olpc = evdev+olpc(olpc)
|
||||
olpcm = evdev+olpc(olpcm)
|
||||
diff --git a/rules/0026-evdev.m_s.part b/rules/0026-evdev.m_s.part
|
||||
index 2dd72051..80067025 100644
|
||||
--- a/rules/0026-evdev.m_s.part
|
||||
+++ b/rules/0026-evdev.m_s.part
|
||||
@@ -2,5 +2,4 @@
|
||||
$evdevkbds = +inet(evdev)+inet(%m)
|
||||
chromebook = +inet(evdev)+inet(chromebook)
|
||||
ppkb = +inet(evdev)+inet(ppkb)
|
||||
- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)
|
||||
* = +inet(evdev)
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
From 8ac41c50ab0aa7cd3a7e94313074115de2a172d2 Mon Sep 17 00:00:00 2001
|
||||
From: Benno Schulenberg <bensberg@telfort.nl>
|
||||
Date: Fri, 10 Jun 2022 12:05:52 +0200
|
||||
Subject: [PATCH] rules: use backslashes instead of slashes for line
|
||||
continuation :\
|
||||
|
||||
This fixes #324.
|
||||
|
||||
Reported-by: Adriaan de Groot
|
||||
|
||||
Bug existed since commit c3c5d02a7e from six weeks ago.
|
||||
|
||||
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
|
||||
---
|
||||
rules/0002-base.lists.part | 28 ++++++++++++++--------------
|
||||
1 file changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/rules/0002-base.lists.part b/rules/0002-base.lists.part
|
||||
index 0af6db56..cb661240 100644
|
||||
--- a/rules/0002-base.lists.part
|
||||
+++ b/rules/0002-base.lists.part
|
||||
@@ -37,18 +37,18 @@
|
||||
unitekkb1925 yahoo
|
||||
|
||||
! $inetmediakbds = \
|
||||
- a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop /
|
||||
- armada asus_laptop benqx btc5090 btc6301urf btc9019u /
|
||||
- cherrybluea cherryblueb cherrycyboard chicony042 /
|
||||
- compalfl90 compaqik13 compaqik18 creativedw7000 /
|
||||
- cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 /
|
||||
- emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy /
|
||||
- geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf /
|
||||
- hpxe4xxx hpxt1000 hpzt11xx inspiron latitude /
|
||||
- logidinovo logidinovoedge logitech_base logitech_g15 /
|
||||
- microsoft4000 microsoft7000 microsoftmult microsoftpro /
|
||||
- microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m /
|
||||
- presario propeller samsung4500 samsung4510 scorpius /
|
||||
- silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 /
|
||||
- thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 /
|
||||
+ a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop \
|
||||
+ armada asus_laptop benqx btc5090 btc6301urf btc9019u \
|
||||
+ cherrybluea cherryblueb cherrycyboard chicony042 \
|
||||
+ compalfl90 compaqik13 compaqik18 creativedw7000 \
|
||||
+ cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 \
|
||||
+ emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy \
|
||||
+ geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf \
|
||||
+ hpxe4xxx hpxt1000 hpzt11xx inspiron latitude \
|
||||
+ logidinovo logidinovoedge logitech_base logitech_g15 \
|
||||
+ microsoft4000 microsoft7000 microsoftmult microsoftpro \
|
||||
+ microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m \
|
||||
+ presario propeller samsung4500 samsung4510 scorpius \
|
||||
+ silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 \
|
||||
+ thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 \
|
||||
toshiba_s3000 trust trustda trust_slimline unitekkb1925
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
rm -rf {xkey*tar.xz*,src,pkg}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
meson
|
||||
python
|
||||
libxslt
|
||||
xorg-xkbcomp
|
||||
|
|
@ -0,0 +1 @@
|
|||
gpg -v --recv-keys 0661D98FC933A145
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
real 0m6.773s
|
||||
user 0m7.827s
|
||||
sys 0m1.180s
|
||||
|
||||
Loading…
Reference in New Issue