upg iptables pacman-mirrorlist gcc
This commit is contained in:
parent
6298222d5d
commit
f175087722
72
gcc/PKGBUILD
72
gcc/PKGBUILD
|
|
@ -8,10 +8,10 @@
|
|||
# toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc
|
||||
# NOTE: libtool requires rebuilt with each new gcc version
|
||||
|
||||
pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go libgccjit)
|
||||
pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go gcc-d lto-dump libgccjit)
|
||||
pkgver=12.1.0
|
||||
_majorver=${pkgver%%.*}
|
||||
pkgrel=03
|
||||
pkgrel=04
|
||||
pkgdesc='The GNU Compiler Collection'
|
||||
arch=(x86_64)
|
||||
url='https://gcc.gnu.org'
|
||||
|
|
@ -19,6 +19,7 @@ makedepends=(
|
|||
binutils
|
||||
doxygen
|
||||
gcc-ada
|
||||
gcc-d
|
||||
git
|
||||
lib32-glibc
|
||||
lib32-gcc-libs
|
||||
|
|
@ -73,6 +74,7 @@ build() {
|
|||
--mandir=/usr/share/man
|
||||
--infodir=/usr/share/info
|
||||
--with-bugurl=https://bugs.archlinux.org/
|
||||
--with-build-config=bootstrap-lto
|
||||
--with-linker-hash-style=gnu
|
||||
--with-system-zlib
|
||||
--enable-__cxa_atexit
|
||||
|
|
@ -83,6 +85,8 @@ build() {
|
|||
--enable-default-ssp
|
||||
--enable-gnu-indirect-function
|
||||
--enable-gnu-unique-object
|
||||
--enable-libstdcxx-backtrace
|
||||
--enable-link-serialization=1
|
||||
--enable-linker-build-id
|
||||
--enable-lto
|
||||
--enable-multilib
|
||||
|
|
@ -92,8 +96,6 @@ build() {
|
|||
--disable-libssp
|
||||
--disable-libstdcxx-pch
|
||||
--disable-werror
|
||||
--with-build-config=bootstrap-lto
|
||||
--enable-link-serialization=1
|
||||
)
|
||||
|
||||
cd gcc-build
|
||||
|
|
@ -105,7 +107,7 @@ build() {
|
|||
CXXFLAGS=${CXXFLAGS/-Werror=format-security/}
|
||||
|
||||
"$srcdir/gcc/configure" \
|
||||
--enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
|
||||
--enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++,d \
|
||||
--enable-bootstrap \
|
||||
"${_confflags[@]:?_confflags unset}"
|
||||
|
||||
|
|
@ -147,7 +149,7 @@ build() {
|
|||
#check() {
|
||||
# cd gcc-build
|
||||
#
|
||||
# # disable libphobos test to avoid segfaults and other unfunny ways to waste my time
|
||||
# # disable libphobos test to avoid segfaults
|
||||
# sed -i '/maybe-check-target-libphobos \\/d' Makefile
|
||||
#
|
||||
# # do not abort on error as some are "expected"
|
||||
|
|
@ -160,9 +162,9 @@ package_gcc-libs() {
|
|||
pkgdesc='Runtime libraries shipped by GCC'
|
||||
depends=('glibc>=2.27')
|
||||
options=(!emptydirs !strip)
|
||||
provides=($pkgname-multilib libgo.so libgfortran.so
|
||||
provides=($pkgname-multilib libgo.so libgfortran.so libgphobos.so
|
||||
libubsan.so libasan.so libtsan.so liblsan.so)
|
||||
replaces=($pkgname-multilib)
|
||||
replaces=($pkgname-multilib libgphobos)
|
||||
|
||||
cd gcc-build
|
||||
make -C $CHOST/libgcc DESTDIR="$pkgdir" install-shared
|
||||
|
|
@ -183,6 +185,10 @@ package_gcc-libs() {
|
|||
make -C $CHOST/libobjc DESTDIR="$pkgdir" install-libs
|
||||
make -C $CHOST/libstdc++-v3/po DESTDIR="$pkgdir" install
|
||||
|
||||
make -C $CHOST/libphobos DESTDIR="$pkgdir" install
|
||||
rm -rf "$pkgdir"/$_libdir/include/d/
|
||||
rm -f "$pkgdir"/usr/lib/libgphobos.spec
|
||||
|
||||
for lib in libgomp \
|
||||
libitm \
|
||||
libquadmath; do
|
||||
|
|
@ -253,8 +259,8 @@ package_gcc() {
|
|||
make -C $CHOST/32/libsanitizer/asan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
|
||||
|
||||
make -C gcc DESTDIR="$pkgdir" install-man install-info
|
||||
rm "$pkgdir"/usr/share/man/man1/{gccgo,gfortran}.1
|
||||
rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
|
||||
rm "$pkgdir"/usr/share/man/man1/{gccgo,gfortran,lto-dump,gdc}.1
|
||||
rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn,gdc}.info
|
||||
|
||||
make -C libcpp DESTDIR="$pkgdir" install
|
||||
make -C gcc DESTDIR="$pkgdir" install-po
|
||||
|
|
@ -409,6 +415,9 @@ package_lib32-gcc-libs() {
|
|||
|
||||
make -C $CHOST/32/libobjc DESTDIR="$pkgdir" install-libs
|
||||
|
||||
make -C $CHOST/libphobos DESTDIR="$pkgdir" install
|
||||
rm -f "$pkgdir"/usr/lib32/libgphobos.spec
|
||||
|
||||
# remove files provided by gcc-libs
|
||||
rm -rf "$pkgdir"/usr/lib
|
||||
|
||||
|
|
@ -417,6 +426,42 @@ package_lib32-gcc-libs() {
|
|||
"$pkgdir/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION"
|
||||
}
|
||||
|
||||
package_gcc-d() {
|
||||
pkgdesc="D frontend for GCC"
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
provides=(gdc)
|
||||
replaces=(gdc)
|
||||
options=(staticlibs debug)
|
||||
|
||||
cd gcc-build
|
||||
make -C gcc DESTDIR="$pkgdir" d.install-{common,man,info}
|
||||
|
||||
install -Dm755 gcc/gdc "$pkgdir"/usr/bin/gdc
|
||||
install -Dm755 gcc/d21 "$pkgdir"/"$_libdir"/d21
|
||||
|
||||
make -C $CHOST/libphobos DESTDIR="$pkgdir" install
|
||||
rm -f "$pkgdir/usr/lib/"lib{gphobos,gdruntime}.so*
|
||||
rm -f "$pkgdir/usr/lib32/"lib{gphobos,gdruntime}.so*
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_lto-dump() {
|
||||
pkgdesc="Dump link time optimization object files"
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
|
||||
cd gcc-build
|
||||
make -C gcc DESTDIR="$pkgdir" lto.install-{common,man,info}
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_libgccjit() {
|
||||
pkgdesc="Just-In-Time Compilation with GCC backend"
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
|
|
@ -441,7 +486,6 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.
|
|||
|
||||
sha256sums=(62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b # gcc-12.1.0.tar.xz
|
||||
f5dba6de2221ea625acae85f97be9dcf550c8125f545372dbaf53e83ebcbeb0d # gcc-12.1.0.tar.xz.sig
|
||||
de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931 # c89
|
||||
2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a # c99
|
||||
1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f) # gcc-ada-repro.patch
|
||||
|
||||
de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931 # c89
|
||||
2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a # c99
|
||||
1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f) # gcc-ada-repro.patch
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
# toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc
|
||||
# NOTE: libtool requires rebuilt with each new gcc version
|
||||
|
||||
pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go libgccjit)
|
||||
pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go gcc-d lto-dump libgccjit)
|
||||
pkgver=12.1.0
|
||||
_majorver=${pkgver%%.*}
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc='The GNU Compiler Collection'
|
||||
arch=(x86_64)
|
||||
license=(GPL3 LGPL FDL custom)
|
||||
|
|
@ -19,6 +19,7 @@ makedepends=(
|
|||
binutils
|
||||
doxygen
|
||||
gcc-ada
|
||||
gcc-d
|
||||
git
|
||||
lib32-glibc
|
||||
lib32-gcc-libs
|
||||
|
|
@ -78,6 +79,7 @@ build() {
|
|||
--mandir=/usr/share/man
|
||||
--infodir=/usr/share/info
|
||||
--with-bugurl=https://bugs.archlinux.org/
|
||||
--with-build-config=bootstrap-lto
|
||||
--with-linker-hash-style=gnu
|
||||
--with-system-zlib
|
||||
--enable-__cxa_atexit
|
||||
|
|
@ -88,6 +90,8 @@ build() {
|
|||
--enable-default-ssp
|
||||
--enable-gnu-indirect-function
|
||||
--enable-gnu-unique-object
|
||||
--enable-libstdcxx-backtrace
|
||||
--enable-link-serialization=1
|
||||
--enable-linker-build-id
|
||||
--enable-lto
|
||||
--enable-multilib
|
||||
|
|
@ -97,8 +101,6 @@ build() {
|
|||
--disable-libssp
|
||||
--disable-libstdcxx-pch
|
||||
--disable-werror
|
||||
--with-build-config=bootstrap-lto
|
||||
--enable-link-serialization=1
|
||||
)
|
||||
|
||||
cd gcc-build
|
||||
|
|
@ -110,7 +112,7 @@ build() {
|
|||
CXXFLAGS=${CXXFLAGS/-Werror=format-security/}
|
||||
|
||||
"$srcdir/gcc/configure" \
|
||||
--enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
|
||||
--enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++,d \
|
||||
--enable-bootstrap \
|
||||
"${_confflags[@]:?_confflags unset}"
|
||||
|
||||
|
|
@ -147,6 +149,9 @@ build() {
|
|||
check() {
|
||||
cd gcc-build
|
||||
|
||||
# disable libphobos test to avoid segfaults
|
||||
sed -i '/maybe-check-target-libphobos \\/d' Makefile
|
||||
|
||||
# do not abort on error as some are "expected"
|
||||
make -O -k check || true
|
||||
"$srcdir/gcc/contrib/test_summary"
|
||||
|
|
@ -156,9 +161,9 @@ package_gcc-libs() {
|
|||
pkgdesc='Runtime libraries shipped by GCC'
|
||||
depends=('glibc>=2.27')
|
||||
options=(!emptydirs !strip)
|
||||
provides=($pkgname-multilib libgo.so libgfortran.so
|
||||
provides=($pkgname-multilib libgo.so libgfortran.so libgphobos.so
|
||||
libubsan.so libasan.so libtsan.so liblsan.so)
|
||||
replaces=($pkgname-multilib)
|
||||
replaces=($pkgname-multilib libgphobos)
|
||||
|
||||
cd gcc-build
|
||||
make -C $CHOST/libgcc DESTDIR="$pkgdir" install-shared
|
||||
|
|
@ -179,6 +184,10 @@ package_gcc-libs() {
|
|||
make -C $CHOST/libobjc DESTDIR="$pkgdir" install-libs
|
||||
make -C $CHOST/libstdc++-v3/po DESTDIR="$pkgdir" install
|
||||
|
||||
make -C $CHOST/libphobos DESTDIR="$pkgdir" install
|
||||
rm -rf "$pkgdir"/$_libdir/include/d/
|
||||
rm -f "$pkgdir"/usr/lib/libgphobos.spec
|
||||
|
||||
for lib in libgomp \
|
||||
libitm \
|
||||
libquadmath; do
|
||||
|
|
@ -249,8 +258,8 @@ package_gcc() {
|
|||
make -C $CHOST/32/libsanitizer/asan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
|
||||
|
||||
make -C gcc DESTDIR="$pkgdir" install-man install-info
|
||||
rm "$pkgdir"/usr/share/man/man1/{gccgo,gfortran}.1
|
||||
rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
|
||||
rm "$pkgdir"/usr/share/man/man1/{gccgo,gfortran,lto-dump,gdc}.1
|
||||
rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn,gdc}.info
|
||||
|
||||
make -C libcpp DESTDIR="$pkgdir" install
|
||||
make -C gcc DESTDIR="$pkgdir" install-po
|
||||
|
|
@ -405,6 +414,9 @@ package_lib32-gcc-libs() {
|
|||
|
||||
make -C $CHOST/32/libobjc DESTDIR="$pkgdir" install-libs
|
||||
|
||||
make -C $CHOST/libphobos DESTDIR="$pkgdir" install
|
||||
rm -f "$pkgdir"/usr/lib32/libgphobos.spec
|
||||
|
||||
# remove files provided by gcc-libs
|
||||
rm -rf "$pkgdir"/usr/lib
|
||||
|
||||
|
|
@ -413,6 +425,42 @@ package_lib32-gcc-libs() {
|
|||
"$pkgdir/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION"
|
||||
}
|
||||
|
||||
package_gcc-d() {
|
||||
pkgdesc="D frontend for GCC"
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
provides=(gdc)
|
||||
replaces=(gdc)
|
||||
options=(staticlibs debug)
|
||||
|
||||
cd gcc-build
|
||||
make -C gcc DESTDIR="$pkgdir" d.install-{common,man,info}
|
||||
|
||||
install -Dm755 gcc/gdc "$pkgdir"/usr/bin/gdc
|
||||
install -Dm755 gcc/d21 "$pkgdir"/"$_libdir"/d21
|
||||
|
||||
make -C $CHOST/libphobos DESTDIR="$pkgdir" install
|
||||
rm -f "$pkgdir/usr/lib/"lib{gphobos,gdruntime}.so*
|
||||
rm -f "$pkgdir/usr/lib32/"lib{gphobos,gdruntime}.so*
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_lto-dump() {
|
||||
pkgdesc="Dump link time optimization object files"
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
|
||||
cd gcc-build
|
||||
make -C gcc DESTDIR="$pkgdir" lto.install-{common,man,info}
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_libgccjit() {
|
||||
pkgdesc="Just-In-Time Compilation with GCC backend"
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
|
|
|
|||
5
gcc/time
5
gcc/time
|
|
@ -19,3 +19,8 @@ real 256m21.812s
|
|||
user 854m7.059s
|
||||
sys 20m56.386s
|
||||
|
||||
12.1-04
|
||||
real 269m12.212s
|
||||
user 936m18.400s
|
||||
sys 21m50.486s
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
pkgbase=iptables
|
||||
pkgname=(iptables iptables-nft)
|
||||
pkgver=1.8.8
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
epoch=1
|
||||
pkgdesc='Linux kernel packet control tool - w/o ipv6 & systemd'
|
||||
arch=(x86_64)
|
||||
|
|
@ -18,8 +18,8 @@ makedepends=(linux-api-headers)
|
|||
backup=(etc/ethertypes etc/iptables/{ip,ip6}tables.rules)
|
||||
source=(https://www.netfilter.org/projects/iptables/files/$pkgbase-$pkgver.tar.bz2{,.sig}
|
||||
empty.rules simple_firewall.rules empty-{filter,mangle,nat,raw,security}.rules
|
||||
iptables-format-security.patch::https://git.netfilter.org/iptables/patch/?id=b72eb12e)
|
||||
|
||||
iptables-format-security.patch::https://git.netfilter.org/iptables/patch/?id=b72eb12e
|
||||
iptables-apply-default-path.patch)
|
||||
|
||||
prepare() {
|
||||
mkdir build
|
||||
|
|
@ -30,6 +30,10 @@ prepare() {
|
|||
|
||||
ln -rs libiptc/linux_list.h include/libiptc
|
||||
patch -p1 -i ../iptables-format-security.patch # Fix build with -Werror=format-security
|
||||
|
||||
# use Arch path
|
||||
patch -p0 -i ../iptables-apply-default-path.patch
|
||||
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -69,7 +73,7 @@ package_iptables-nft() {
|
|||
_package() {
|
||||
DESTDIR="$pkgdir" make -C build install
|
||||
|
||||
for _x in {arp,eb,ip}tables{,-restore,-save} iptables-apply iptables-xml; do
|
||||
for _x in {arp,eb,ip}tables{,-restore,-save} iptables-xml; do
|
||||
if [[ $1 = nft || $_x = ip* ]]; then
|
||||
ln -sf xtables-$1-multi "$pkgdir/usr/bin/$_x"
|
||||
else
|
||||
|
|
@ -102,5 +106,5 @@ sha256sums=(71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f # i
|
|||
52bd70dff3e1e1a64127ad7ed86840834b79756c3bdb6947b7c6279ffe95dd48 # empty-nat.rules
|
||||
5768a471c0559848635c39d270e456bfa5c43eda65f5f6f666fea2d277183a37 # empty-raw.rules
|
||||
91161a73f323016a9efc5eabd16243d20f8ca2467995cf0eabfb95f845090121 # empty-security.rules
|
||||
9d9e23d6452632e7944d942ccbf6c82deb327780a084611aa7444eb88c596a70) # iptables-format-security.patch
|
||||
|
||||
9d9e23d6452632e7944d942ccbf6c82deb327780a084611aa7444eb88c596a70 # iptables-format-security.patch
|
||||
770ceaedce26d05eb1b9d0c4c65f5b8e92facd1dc0652a29c859336d6bc347f6) # iptables-apply-default-path.patch
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
pkgbase=iptables
|
||||
pkgname=(iptables iptables-nft)
|
||||
pkgver=1.8.8
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
epoch=1
|
||||
pkgdesc='Linux kernel packet control tool'
|
||||
arch=(x86_64)
|
||||
|
|
@ -16,7 +16,8 @@ backup=(etc/ethertypes etc/iptables/{ip,ip6}tables.rules)
|
|||
source=(https://www.netfilter.org/projects/iptables/files/$pkgbase-$pkgver.tar.bz2{,.sig}
|
||||
empty.rules simple_firewall.rules empty-{filter,mangle,nat,raw,security}.rules
|
||||
{arp,eb,ip,ip6}tables.service iptables-{legacy,nft}-flush
|
||||
iptables-format-security.patch::https://git.netfilter.org/iptables/patch/?id=b72eb12e)
|
||||
iptables-format-security.patch::https://git.netfilter.org/iptables/patch/?id=b72eb12e
|
||||
iptables-apply-default-path.patch)
|
||||
sha1sums=('98783621a5e58ff55f83b1350523f3de41af621d'
|
||||
'SKIP'
|
||||
'83b3363878e3660ce23b2ad325b53cbd6c796ecf'
|
||||
|
|
@ -32,7 +33,8 @@ sha1sums=('98783621a5e58ff55f83b1350523f3de41af621d'
|
|||
'9cec592787e32451f58fa608ea057870e07aa704'
|
||||
'd10af7780d1634778d898c709e2d950aa1561856'
|
||||
'15c1684f3e671f4d0ede639a7c9c08e1a841511c'
|
||||
'df4b0a31dfa01cff65926d439ab1475f246d4e74')
|
||||
'df4b0a31dfa01cff65926d439ab1475f246d4e74'
|
||||
'454d0a6d3bca14b8702e7c5e2672f5bc0c832b85')
|
||||
validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4'
|
||||
'37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team
|
||||
|
||||
|
|
@ -45,6 +47,9 @@ prepare() {
|
|||
|
||||
ln -rs libiptc/linux_list.h include/libiptc
|
||||
patch -p1 -i ../iptables-format-security.patch # Fix build with -Werror=format-security
|
||||
|
||||
# use Arch path
|
||||
patch -p0 -i ../iptables-apply-default-path.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -83,7 +88,7 @@ package_iptables-nft() {
|
|||
_package() {
|
||||
DESTDIR="$pkgdir" make -C build install
|
||||
|
||||
for _x in {arp,eb,ip,ip6}tables{,-restore,-save} iptables-apply iptables-xml; do
|
||||
for _x in {arp,eb,ip,ip6}tables{,-restore,-save} iptables-xml; do
|
||||
if [[ $1 = nft || $_x = ip* ]]; then
|
||||
ln -sf xtables-$1-multi "$pkgdir/usr/bin/$_x"
|
||||
else
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
nftables
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
--- iptables/iptables-apply.8.in.orig 2022-07-25 17:12:06.833791345 +0300
|
||||
+++ iptables/iptables-apply.8.in 2022-07-25 17:13:35.780742653 +0300
|
||||
@@ -21,11 +21,11 @@
|
||||
Successfully applied rules can also be written to savefile and later used
|
||||
to roll back to this state. This can be used to implement a store last good
|
||||
configuration mechanism when experimenting with an iptables setup script:
|
||||
-iptables-apply \-w /etc/network/iptables.up.rules \-c /etc/network/iptables.up.run
|
||||
+iptables-apply \-w /etc/iptables/iptables.rules \-c /etc/iptables/iptables.run
|
||||
.PP
|
||||
When called as ip6tables\-apply, the script will use
|
||||
ip6tables\-save/\-restore and IPv6 default values instead. Default
|
||||
-value for rulesfile is '/etc/network/iptables.up.rules'.
|
||||
+value for rulesfile is '/etc/iptables/iptables.rules'.
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
\fB\-t\fP \fIseconds\fR, \fB\-\-timeout\fP \fIseconds\fR
|
||||
@@ -34,11 +34,11 @@
|
||||
.TP
|
||||
\fB\-w\fP \fIsavefile\fR, \fB\-\-write\fP \fIsavefile\fR
|
||||
Specify the savefile where successfully applied rules will be written to
|
||||
-(default if empty string is given: /etc/network/iptables.up.rules).
|
||||
+(default if empty string is given: /etc/iptables/iptables.rules).
|
||||
.TP
|
||||
\fB\-c\fP \fIruncmd\fR, \fB\-\-command\fP \fIruncmd\fR
|
||||
Run command runcmd to configure iptables instead of applying a rulesfile
|
||||
-(default: /etc/network/iptables.up.run).
|
||||
+(default: /etc/iptables/iptables.run).
|
||||
.TP
|
||||
\fB\-h\fP, \fB\-\-help\fP
|
||||
Display usage information.
|
||||
--- iptables/iptables-apply.orig 2022-07-25 17:12:11.713806961 +0300
|
||||
+++ iptables/iptables-apply 2022-07-25 17:12:34.573880116 +0300
|
||||
@@ -31,16 +31,16 @@
|
||||
(*6*)
|
||||
SAVE=ip6tables-save
|
||||
RESTORE=ip6tables-restore
|
||||
- DEF_RULESFILE="/etc/network/ip6tables.up.rules"
|
||||
+ DEF_RULESFILE="/etc/iptables/ip6tables.rules"
|
||||
DEF_SAVEFILE="$DEF_RULESFILE"
|
||||
- DEF_RUNCMD="/etc/network/ip6tables.up.run"
|
||||
+ DEF_RUNCMD="/etc/iptables/ip6tables.run"
|
||||
;;
|
||||
(*)
|
||||
SAVE=iptables-save
|
||||
RESTORE=iptables-restore
|
||||
- DEF_RULESFILE="/etc/network/iptables.up.rules"
|
||||
+ DEF_RULESFILE="/etc/iptables/iptables.rules"
|
||||
DEF_SAVEFILE="$DEF_RULESFILE"
|
||||
- DEF_RUNCMD="/etc/network/iptables.up.run"
|
||||
+ DEF_RUNCMD="/etc/iptables/iptables.run"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=pacman-mirrorlist
|
||||
pkgver=20220605
|
||||
pkgver=20220724
|
||||
pkgrel=01
|
||||
pkgdesc="Arch Linux mirror list for use by pacman HTTPS ONLY"
|
||||
arch=('any')
|
||||
|
|
@ -37,5 +37,5 @@ package() {
|
|||
|
||||
license=('GPL')
|
||||
|
||||
sha256sums=(c2b04786f88e3266a16db97c808eb79b73c9d1223fec72825e2ac8bf79d138a6) # mirrorlist
|
||||
sha256sums=(3bb6bea7409d92edee2854014bf1a467fddb744075dd18b05bf233ec5772367c) # mirrorlist
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Contributor: Dan McGee <dan@archlinux.org>
|
||||
|
||||
pkgname=pacman-mirrorlist
|
||||
pkgver=20220605
|
||||
pkgver=20220724
|
||||
pkgrel=1
|
||||
pkgdesc="Arch Linux mirror list for use by pacman"
|
||||
arch=('any')
|
||||
|
|
@ -27,5 +27,5 @@ package() {
|
|||
install -m644 "$srcdir/mirrorlist" "$pkgdir/etc/pacman.d/"
|
||||
}
|
||||
|
||||
md5sums=('36acb97b145e3b04af627330785183d2')
|
||||
sha256sums=('c2b04786f88e3266a16db97c808eb79b73c9d1223fec72825e2ac8bf79d138a6')
|
||||
md5sums=('414ac013b01bb6aa49a66f8eb51971b6')
|
||||
sha256sums=('3bb6bea7409d92edee2854014bf1a467fddb744075dd18b05bf233ec5772367c')
|
||||
|
|
|
|||
|
|
@ -3,3 +3,5 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue