tb/contrib
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

Merge branch '3.5' into 3.6

Browse Source 
Conflicts:
	p5-http-cookies/.signature
	python3-pygments/.footprint
	python3-pygments/.signature
This commit is contained in:
Juergen Daubert 2020-11-21 13:18:22 +00:00
commit 8e03dde9d2
59 changed files with 1397 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
alsaequal/.footprint Normal file
View File

@ -0,0 +1,5 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/alsa-lib/
-rwxr-xr-x root/root usr/lib/alsa-lib/libasound_module_ctl_equal.so
-rwxr-xr-x root/root usr/lib/alsa-lib/libasound_module_pcm_equal.so

5
alsaequal/.signature Normal file
View File

@ -0,0 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF38eRnrq20/aF0TbUztpliFpnMVLYjUnfS789FnD3nV1geFMBRf4lXa3ukF6cF1/+ZVgquapry5AgFForC8O/2AQ=
SHA256 (Pkgfile) = 6621c96a17a87f143e612a19452cce9f013e2245ef6e769a6cece5127fb020d1
SHA256 (.footprint) = 758d884e5fa1faaa86557799bfce261885fe1c0f6d98f3793f695bc8009b3fb8
SHA256 (alsaequal-0.7.1.tar.gz) = 25a3da01fd471015ecefe679bcf157be47af307cc11ac5e5888157291eb8ce54

15
alsaequal/Pkgfile Normal file
View File

@ -0,0 +1,15 @@
# Description: Real-time adjustable equalizer plugin for ALSA
# URL: https://github.com/bassdr/alsaequal
# Maintainer: Alexandr Savca, alexandrsavca89 at gmail dot com
# Depends on: alsa-lib caps
name=alsaequal
version=0.7.1
release=1
source=(https://github.com/bassdr/$name/archive/v$version/$name-$version.tar.gz)
build() {
cd $name-$version
make Q= DESTDIR=$PKG install
}

46
alsaequal/README Normal file
View File

@ -0,0 +1,46 @@
README for alsaequal
POST-INSTALL
1. Add '/usr/lib/ladspa' to LD_LIBRARY_PATH.
2. Add the following to your ALSA configuration file:
/etc/asound.conf
--------------------------------------------------------------------------
ctl.equal {
type equal;
}
pcm.plugequal {
type equal;
# Modify the line below if you do not want to use sound card 0.
#slave.pcm "plughw:0,0";
# by default we want to play from more sources at time:
slave.pcm "plug:dmix";
}
# pcm.equal {
# If you do not want the equalizer to be your default soundcard
# comment the following line and uncomment the above line.
# (You can choose it as the output device by addressing it with specific
# apps,eg mpg123 -a equal 06.Back_In_Black.mp3)
pcm.!default {
type plug;
slave.pcm plugequal;
}
--------------------------------------------------------------------------
And you are ready to change your equalizer using command
$ alsamixer -D equal
Note that configuration file is different for each user (until not
specified else) it is saved in ~/.alsaequal.bin. So if you want to use
ALSAEqual with mpd or another software running under different user, you
can configure it using
$ su mpd -c 'alsamixer -D equal'
or for example, you can make a symlink to your .alsaequal.bin in his home.

14
arpspoof/.footprint Normal file
View File

@ -0,0 +1,14 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/arpspoof
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/python3.7/
drwxr-xr-x root/root usr/lib/python3.7/site-packages/
drwxr-xr-x root/root usr/lib/python3.7/site-packages/arpspoof/
-rw-r--r-- root/root usr/lib/python3.7/site-packages/arpspoof/__init__.py
drwxr-xr-x root/root usr/lib/python3.7/site-packages/arpspoof/__pycache__/
-rw-r--r-- root/root usr/lib/python3.7/site-packages/arpspoof/__pycache__/__init__.cpython-37.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/arpspoof/__pycache__/__init__.cpython-37.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/arpspoof/__pycache__/arpspoof.cpython-37.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/arpspoof/__pycache__/arpspoof.cpython-37.pyc
-rw-r--r-- root/root usr/lib/python3.7/site-packages/arpspoof/arpspoof.py

7
arpspoof/.signature Normal file
View File

@ -0,0 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF31AzEqDWhXPc/GtIOCQjmEwAA2CUWJaAaP2PdAwG/b0123Gg/ir/ygKC5zOCt0/vUOBi0hCkfV4f8NZ1yhMmdg0=
SHA256 (Pkgfile) = 65d5c1da0054c64144190bedc56c08ecc3f9c8c0d3db8f6cbb018e9b3bf1e8e5
SHA256 (.footprint) = 9d73fe2e6c80194a3b82afcc9fb42e9c99350e50a299d2df5e68fe4683b1d881
SHA256 (arpspoof-83594671338218dd80d6328485179cf62f943c9d.zip) = 591e9447394db3d24ce77ef4d6cb40b7f4dc3dcd6e212815b93f20f3b10a8503
SHA256 (0001-arpspoof.py-show-help-without-root-privileges.patch) = c1cf0f365e88bd41ff9e8632fde68f74dafd15c812dff81cceb7e6c53e518252
SHA256 (arpspoof.sh) = b0a083bae3740aa9920b5386f144b0110e3d94fa0dbc1cd0dac974f1e822cd17

30
arpspoof/0001-arpspoof.py-show-help-without-root-privileges.patch Normal file
View File

@ -0,0 +1,30 @@
From c7b2e59aea9264113dcd4823bfebc33e1cb33fe3 Mon Sep 17 00:00:00 2001
From: Alexandr Savca <alexandrsavca89@gmail.com>
Date: Wed, 23 Sep 2020 14:43:59 +0300
Subject: [PATCH] arpspoof.py: show help without root privileges
---
arpspoof/arpspoof.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arpspoof/arpspoof.py b/arpspoof/arpspoof.py
index 61c1d42..024648a 100644
--- a/arpspoof/arpspoof.py
+++ b/arpspoof/arpspoof.py
@@ -59,11 +59,12 @@ def init_args():
def main():
+ options, args = init_args()
+
if os.geteuid() != 0:
print("[-] Run me as root")
sys.exit(1)
- options, args = init_args()
host = args[0]
mac = get_if_hwaddr(options.interface)
--
2.28.0

29
arpspoof/Pkgfile Normal file
View File

@ -0,0 +1,29 @@
# Description: Poison hosts via arp-requests as well as arp-replies
# URL: https://github.com/byt3bl33d3r/arpspoof
# Maintainer: Alexandr Savca, alexandrsavca89 at gmail dot com
# Depends on: scapy
name=arpspoof
version=0.1.0.8359467
_commit=83594671338218dd80d6328485179cf62f943c9d
release=1
source=(https://github.com/byt3bl33d3r/$name/archive/$_commit/$name-$_commit.zip
0001-arpspoof.py-show-help-without-root-privileges.patch
$name.sh)
build() {
cd $name-$_commit
patch -p1 < $SRC/0001-arpspoof.py-show-help-without-root-privileges.patch
sed -i "s|Usage: %prog|Usage: $name|" $name/$name.py
python3 setup.py build
python3 setup.py install \
--prefix=/usr --root=$PKG --optimize=1 --skip-build
# remove junk
rm -r $PKG/usr/lib/python*/site-packages/$name-*.egg-info
# install wrapper
install -Dm755 $SRC/$name.sh $PKG/usr/bin/$name
}

7
arpspoof/README Normal file
View File

@ -0,0 +1,7 @@
README for arpspoof
NOTES
Basic spoofing usage:
arpspoof -i ${IFACE} -t ${VICTIM_IP} ${GW_IP} &
arpspoof -i ${IFACE} -t ${GW_IP} ${VICTIM_IP} &

3
arpspoof/arpspoof.sh Normal file
View File

@ -0,0 +1,3 @@
#!/bin/sh
PYVER=$(python3 -V | grep -Po '\d\.\d')
python3 /usr/lib/python${PYVER}/site-packages/arpspoof/arpspoof.py

8
caps/.footprint Normal file
View File

@ -0,0 +1,8 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/ladspa/
-rw-r--r-- root/root usr/lib/ladspa/caps.so
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/ladspa/
drwxr-xr-x root/root usr/share/ladspa/rdf/
-rw-r--r-- root/root usr/share/ladspa/rdf/caps.rdf

5
caps/.signature Normal file
View File

@ -0,0 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF38CebYmThMCwBYhURBlX3cr8IqEVcdnYCl4cXM2XQA8lxwFI75goYtGLrEXKqz952Ro5mdeCFr+sZkqrggzWxAM=
SHA256 (Pkgfile) = d3a296cd27780c44ede03f1b870705bfddca518c2086c5ba0a009f4c9cc1948a
SHA256 (.footprint) = de1be3eb943c1823efbfcf46fe0b9f89c5237d51288008b7ef106f85b593dc23
SHA256 (caps_0.9.26.tar.bz2) = e7496c5bce05abebe3dcb635926153bbb58a9337a6e423f048d3b61d8a4f98c9

19
caps/Pkgfile Normal file
View File

@ -0,0 +1,19 @@
# Description: LADSPA C* Audio Plugin Suite
# URL: http://quitte.de/dsp/caps.html
# Maintainer: Alexandr Savca, alexandrsavca89 at gmail dot com
# Depends on: ladspa
name=caps
version=0.9.26
release=1
source=(http://quitte.de/dsp/${name}_${version}.tar.bz2)
build() {
cd $name-$version
# remove hardcoded -O flag
sed -i 's/OPTS = -O. /OPTS = /' Makefile
make PREFIX=/usr
make DESTDIR=$PKG install
}

6
chatty/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3yirx+wn4f3LRpW8jhjpi11uLTx2MM2V/m6gbXE95idi/r9WH9JwsUemMGAgBQ+VSUcNP3f2TFy6rhKYhM9JRQQ=
SHA256 (Pkgfile) = ed6813e5426054f6d35ba88602ca9112adea675e289c4158c10f31b8ec69dc59
RWSagIOpLGJF38hLv2k/IlQTonG36i/h9a1jtkmChyJ6CfQB3ceuJ/0AnzJc++Jkgmy4F+9f+crYTz6g52DpM+8C7w1/qCNGuQE=
SHA256 (Pkgfile) = ba17dafe8b77ffd2045320c72040781ef9ca0c7d1620c91b2e1a282d3e34ade5
SHA256 (.footprint) = ebe1adf0f71ef553ec5127790e0ccc4634d3ce6fa0c6adb7a817891eb4069fd9
SHA256 (Chatty_0.13.zip) = c68009fbc946e9e85c7c3099cb031737a6e996d913c41c76e5a328f83eea406f
SHA256 (Chatty_0.13.1.zip) = b92910ad1e7df29fcd7e5d8f61a47efc641767c8bdf1828f4f18e7a0b79413d3
SHA256 (chatty.desktop) = 336ec8a45dee69253a636f5f6f1159ab5fb2677e5c1927cc9272d43f7cb6488c

2
chatty/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: openjdk8
name=chatty
version=0.13
version=0.13.1
release=1
source=(https://github.com/chatty/chatty/releases/download/v$version/Chatty_$version.zip
chatty.desktop)

6
firefox/.signature
View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF369ucmaF3T7pZg2/N5LDxa6gs+eOKXt+gR8xPM6DWWfKPZ6EovyYWV6O1bITR1VzgcGbzVh1PKdxgvbnoZUzvQk=
SHA256 (Pkgfile) = b5293fd839098387adbfb3320e59d9a86f2d913c47d83645d4f82d3d7d91a6ac
RWSagIOpLGJF38q4jRgJdQvtf4ZZas9U4ybwIgiyaWgkhASmY6H87r+Pag6lO90zrRbYkd0kQtjEijBZtbsNpsWZA+AHzxUYxwo=
SHA256 (Pkgfile) = a11bf16d3b5dcacca196e9d8d7f6dd9210bcbdbdf499fb3021587b3e203cc296
SHA256 (.footprint) = 8b8bebe1e51e7e8d82a57e60b95e4fd85c806ecbcbb15ad1774730025ba0e931
SHA256 (firefox-82.0.3.source.tar.xz) = 4df40aecf4b71107c4816db585bcd425f093123f29d8563bc2443a8659058691
SHA256 (firefox-83.0.source.tar.xz) = d69e84e8b8449f828683d274c24e03095858362bfed21b08bdd7fe715eea5398
SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91
SHA256 (0001-Use-remoting-name-for-GDK-application-names.patch) = 3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75

2
firefox/Pkgfile
View File

@ -5,7 +5,7 @@
# Optional: sccache
name=firefox
version=82.0.3
version=83.0
release=1
source=(https://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz
firefox.desktop

3
hashid/.footprint Normal file
View File

@ -0,0 +1,3 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/hash-identifier

5
hashid/.signature Normal file
View File

@ -0,0 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3y0Koz1tHl2nd1j5Teu00Crhw2DDER5FvtXSINb51KKmjDxIHC35LIsxFsSroeBel13Si5Co4eqNuIVZfNlnyAQ=
SHA256 (Pkgfile) = 4b25cea3c34971f6467c9d2c1bc5cf745f57055a62079c409546b1dc0f9b6c9b
SHA256 (.footprint) = 5c9b65dcd387f0f142521f5f37313588d5163b2c1205a19a0ba4d03bf4019c11
SHA256 (hashID-7e8473a823060e56d4b6090a98591e252bd9505e.zip) = 7d1b3ee2e59a1ce740d141fa17d4620c697b291f546c0aaadfa71e2b2819fb3e

15
hashid/Pkgfile Normal file
View File

@ -0,0 +1,15 @@
# Description: Identify the different types of hashes used to encrypt data
# URL: https://github.com/psypanda/hashID
# Maintainer: Alexandr Savca, alexandrsavca89 at gmail dot com
name=hashid
version=3.1.4.7e8473a
_commit=7e8473a823060e56d4b6090a98591e252bd9505e
release=1
source=(https://github.com/psypanda/hashID/archive/$_commit/hashID-$_commit.zip)
build() {
cd hashID-$_commit
install -Dm755 $name.py $PKG/usr/bin/hash-identifier
}

6
i3/.signature
View File

@ -1,8 +1,8 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3/Ws/zLSUZA+zACSLZMj1xStLOCXmy1mEtKtU1ycW0KuDCPX9Busu3U9jGc7zYNWyJQbXA6X1EQ87MFLmOEHoQs=
SHA256 (Pkgfile) = 02caeb18d563ccb505ec803d62ad275d857da99e52b4643120d12cf48754979b
RWSagIOpLGJF3+NAehdBKyorJUO1fj2qI14879oBiFew5RJSM5411Of/mT9wd1XzsRIIW9zAx3ZKhvwtSs8SwqmayrO8mG6zXgo=
SHA256 (Pkgfile) = a984c6124c3f251dcdd86a5690be3eccb1cd2fd3380d1fc94190dede4b14dc81
SHA256 (.footprint) = ffddeda3d45fadfa85e007ad5f4413605d3f52ef3d4489eb7445b4fc8528afbe
SHA256 (i3-4.18.3.tar.bz2) = 53ae7903fad6eea830d58e949698e4a502c432c0d0a582659a0a59b1b995b10d
SHA256 (i3-4.19.tar.xz) = aca48b03c0c70607826a1a91333065ff44d61774c152ddc9210fbc1627355872
SHA256 (yajl-2.1.0.tar.gz) = 3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a
SHA256 (libev-4.33.tar.gz) = 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea
SHA256 (startup-notification-0.12.tar.gz) = 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a

40
i3/Pkgfile
View File

@ -4,9 +4,9 @@
# Depends on: cmake pango xorg-xcb-util-cursor xorg-xcb-util-keysyms xorg-xcb-util-wm
name=i3
version=4.18.3
version=4.19
release=1
source=(http://i3wm.org/downloads/$name-$version.tar.bz2
source=(http://i3wm.org/downloads/$name-$version.tar.xz
https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz
http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz
http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz
@ -26,17 +26,25 @@ build() {
# libxkbcommon
cd $SRC/libxkbcommon-1.0.1
meson build --prefix=/ --default-library=static -Denable-{wayland,docs}=false
ninja -C build -j ${JOBS:-1}
DESTDIR=$LIBS ninja -C build install
meson setup build . \
--prefix=/ \
--buildtype=plain \
--default-library=static \
-D enable-wayland=false \
-D enable-docs=false
meson compile -C build -j ${JOBS:-1}
DESTDIR=$LIBS meson install -C build
# yajl
cd $SRC/yajl-2.1.0
cmake . -Wno-dev
make
cp -r yajl-2.1.0/include $LIBS
cp yajl-2.1.0/lib/libyajl_s.a $LIBS/lib/libyajl.a
cp yajl-2.1.0/share/pkgconfig/yajl.pc $LIBS/lib/pkgconfig
cmake -S . -B build \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \
-Wno-dev
cmake --build build
cp -r build/yajl-2.1.0/include $LIBS
cp build/yajl-2.1.0/lib/libyajl_s.a $LIBS/lib/libyajl.a
cp build/yajl-2.1.0/share/pkgconfig/yajl.pc $LIBS/lib/pkgconfig
# libev
cd $SRC/libev-4.33
@ -56,10 +64,14 @@ build() {
cd $SRC/$name-$version
export CFLAGS="$CFLAGS -I$LIBS/include"
export LDFLAGS="$LDFLAGS -L$LIBS/lib"
export PKG_CONFIG_PATH="$LIBS/lib/pkgconfig"
./configure --prefix=/usr --disable-builddir
make
make DESTDIR=$PKG install
meson setup build . \
--prefix=/usr \
--sysconfdir=/usr/etc \
--buildtype=release \
--pkg-config-path="$LIBS/lib/pkgconfig"
meson compile -C build -j ${JOBS:-1}
DESTDIR=$PKG meson install -C build
install -d $PKG/usr/share/man/man1
install -m 0644 man/*.1 $PKG/usr/share/man/man1/
rm -r $PKG/usr/share/doc
}

6
imapfilter/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF35VCtP6kwwQvmuzDvnyHAXKKo8UKA0PTaVHF0a60Wa154lLA7h1tZn1sCTnnEKpWbzhRu8D8r2ymhN67YyLhkAQ=
SHA256 (Pkgfile) = 39f73ba3e9a0a6707e5d8ea60a29847fb0bae5d572031b3d6351343ba325f78c
RWSagIOpLGJF34nogah1WMXib/++0janZ6mmmuWfnt6AOK+Lquc/KmuC9Ah2VcPIVT1SJEqLN/rMrvAavxRQd12efBPOIgQKFg8=
SHA256 (Pkgfile) = 206ed9746b1c07c2182fdddec8ca285b37fe2f142e695337b9851bb9277e9884
SHA256 (.footprint) = bc1dacfab0424a4006e7fbac9485795c85d7f4cfc76baacb35333e131ec4abcf
SHA256 (imapfilter-2.7.3.tar.gz) = e73d53aa5976c76d91dd211fc1422827c349cf1515dd0d6a522d626705b04e1e
SHA256 (imapfilter-2.7.4.tar.gz) = ac4cf846edb9b96c86e3a250f54130af7f1bb6c4c2600bf014dd1c819e10c72c

2
imapfilter/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: lua libpcre2
name=imapfilter
version=2.7.3
version=2.7.4
release=1
source=(https://github.com/lefcha/imapfilter/archive/v$version/$name-$version.tar.gz)

5
libtorrent-rasterbar/.signature
View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF37d/42ikH8MWqzaVMW+/siBJwFkW8HoYvViar3xIgAQlgT8OH1wcnJ4SSYnxw0tdhdV7/6xLngfena+b+VzRSAc=
SHA256 (Pkgfile) = c5b9511331cdf50af72dab2a4938855174736858f160747869169c81076cb109
RWSagIOpLGJF35E6tWRIEzGlC2C7uTqAHHSBdIF7bAg/EonV66GetlZnlEhdI310ZAAs/R1uRhjKTUIXLLwVqE3lTmtUowmjmQQ=
SHA256 (Pkgfile) = ff824ed63e299f34413afd7f67688a08d1893bc21a2c681ddbbf2c0c596fa04b
SHA256 (.footprint) = ab616142eb5d5f17517be114bd878c09a0f59202182875fb68de2d8fbf3ed907
SHA256 (libtorrent-rasterbar-1.2.10.tar.gz) = d0dd30bdc3926587c4241f4068d8e39628a6c1f9f6cf53195f0e9bc90017befb
SHA256 (libtorrent-rasterbar-cxx14-fix.patch) = e94a7545534d8f54ae27f1db0db9d551c803d6412f14d5be1f0f0544a0405dff

17
libtorrent-rasterbar/Pkgfile
View File

@ -5,15 +5,26 @@
name=libtorrent-rasterbar
version=1.2.10
release=1
source=(https://github.com/arvidn/libtorrent/releases/download/libtorrent-$version/$name-$version.tar.gz)
release=2
source=(https://github.com/arvidn/libtorrent/releases/download/libtorrent-$version/$name-$version.tar.gz
libtorrent-rasterbar-cxx14-fix.patch)
build() {
cd $name-$version
# https://github.com/arvidn/libtorrent/issues/5024
patch -p1 -i $SRC/libtorrent-rasterbar-cxx14-fix.patch
export PYTHON='/usr/bin/python3'
mkdir $SRC/bin
ln -s /usr/bin/python3 $SRC/bin/python
export PATH="$SRC/bin:$PATH"
./configure \
--prefix=/usr \
--enable-python-binding
--enable-python-binding \
--with-libiconv \
--with-boost-python=boost_python3
make
make DESTDIR=$PKG install

737
libtorrent-rasterbar/libtorrent-rasterbar-cxx14-fix.patch Normal file
View File

@ -0,0 +1,737 @@
From ec286b37283a2bc03cf8b0b6ae72e920265eb754 Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@berkeley.edu>
Date: Fri, 21 Aug 2020 09:01:40 +0000
Subject: [PATCH 01/10] Use ax_cxx_compile_stdcxx.m4 and move to c++14 Use
ax_cxx_compile_stdcxx.m4 instead of ax_cxx_compile_stdcxx_11.m4. Use c++14
instead of c++11.
---
configure.ac | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0b9b0c446b..c037607874 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,8 +143,7 @@ AS_ECHO
AS_ECHO "Checking for boost libraries:"
AX_BOOST_BASE([1.58])
-
-AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
+AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory])
AX_BOOST_SYSTEM()
AS_IF([test -z "$BOOST_SYSTEM_LIB"],
From a9012add4018381ce50b83a81980b2fd7831606b Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@berkeley.edu>
Date: Fri, 21 Aug 2020 21:35:37 +0000
Subject: [PATCH 02/10] add --with-std=c++14 configure switch --with-std=c++14
allows the user to specify what C++ standard to use. It supports
{c,gnu}++{11,14,17}. If unspecified the default is c++11. Either
AX_CXX_COMPILE_STDCXX_11 or AX_CXX_COMPILE_STDCXX are called appropriately.
---
configure.ac | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index c037607874..c7ee9b8edd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,7 +143,41 @@ AS_ECHO
AS_ECHO "Checking for boost libraries:"
AX_BOOST_BASE([1.58])
-AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory])
+
+AC_ARG_WITH(
+ [std],
+ [AS_HELP_STRING(
+ [--with-std[=ARG]],
+ [specify C++ standard (e.g., c++14 or gnu++11) [default=c++11]])],
+ [[ARG_STD=$withval]],
+ [[ARG_STD=c++11]]
+)
+
+AC_MSG_CHECKING([which c++ standard to use])
+AS_CASE(["$ARG_STD"],
+ ["c++17"|"C++17"], [
+ AC_MSG_RESULT([-std=c++17])
+ AX_CXX_COMPILE_STDCXX(17, [noext], [mandatory])
+ ],
+ ["gnu++17"], [
+ AC_MSG_RESULT([-std=gnu++17])
+ AX_CXX_COMPILE_STDCXX(17, [ext], [mandatory])
+ ],
+ ["c++14"|"C++14"], [
+ AC_MSG_RESULT([-std=c++14])
+ AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory])
+ ],
+ [gnu++14], [
+ AC_MSG_RESULT([-std=gnu++14])
+ AX_CXX_COMPILE_STDCXX(14, [ext], [mandatory])
+ ],
+ [gnu++11], [
+ AC_MSG_RESULT([-std=gnu++11])
+ AX_CXX_COMPILE_STDCXX_11([ext], [mandatory])
+ ],
+ [AC_MSG_RESULT([-std=c++11])
+ AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])]
+)
AX_BOOST_SYSTEM()
AS_IF([test -z "$BOOST_SYSTEM_LIB"],
@@ -589,6 +623,7 @@ Build options:
debug build: ${ARG_ENABLE_DEBUG:-no}
invariant checks: ${ARG_ENABLE_INVARIANT:-no}
logging support: ${ARG_ENABLE_LOGGING:-yes}
+ with std: ${ARG_STD:-c++11}
Features:
encryption support: ${ARG_ENABLE_ENCRYPTION:-yes}
From bca36cdcce209d1dfb473eab2e049ccf29b8a72e Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@berkeley.edu>
Date: Fri, 21 Aug 2020 21:53:20 +0000
Subject: [PATCH 03/10] add quotes
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index c7ee9b8edd..ba9b02106a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,11 +167,11 @@ AS_CASE(["$ARG_STD"],
AC_MSG_RESULT([-std=c++14])
AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory])
],
- [gnu++14], [
+ ["gnu++14"], [
AC_MSG_RESULT([-std=gnu++14])
AX_CXX_COMPILE_STDCXX(14, [ext], [mandatory])
],
- [gnu++11], [
+ ["gnu++11"], [
AC_MSG_RESULT([-std=gnu++11])
AX_CXX_COMPILE_STDCXX_11([ext], [mandatory])
],
From bf6ed65a4068071a6b8565128f8cebd3f29fef55 Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@berkeley.edu>
Date: Fri, 21 Aug 2020 23:07:08 +0000
Subject: [PATCH 04/10] capitalization
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index ba9b02106a..6ea4a4fde2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,7 @@ AC_ARG_WITH(
[[ARG_STD=c++11]]
)
-AC_MSG_CHECKING([which c++ standard to use])
+AC_MSG_CHECKING([which C++ standard to use])
AS_CASE(["$ARG_STD"],
["c++17"|"C++17"], [
AC_MSG_RESULT([-std=c++17])
From feb65af2bd7db89af0ad5ef57dfd669591742bb4 Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@berkeley.edu>
Date: Sat, 22 Aug 2020 08:51:12 +0000
Subject: [PATCH 05/10] add --with-cxx-standard=14 configure switch C++
standard is specified by 11, 14 or 17. Either AX_CXX_COMPILE_STDCXX_11 or
AX_CXX_COMPILE_STDCXX are called appropriately.
---
configure.ac | 64 ++++++++++++++++++++-----------------
m4/ax_cxx_compile_stdcxx.m4 | 36 ++++++++++++---------
2 files changed, 55 insertions(+), 45 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6ea4a4fde2..2f0a4326f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,39 +145,43 @@ AS_ECHO "Checking for boost libraries:"
AX_BOOST_BASE([1.58])
AC_ARG_WITH(
- [std],
+ [cxx-standard],
[AS_HELP_STRING(
- [--with-std[=ARG]],
- [specify C++ standard (e.g., c++14 or gnu++11) [default=c++11]])],
- [[ARG_STD=$withval]],
- [[ARG_STD=c++11]]
+ [--with-cxx-std[=ARG]],
+ [specify C++ standard (e.g., 11, 14 or 17) [default=11]])],
+ [[ARG_CXX_STANDARD=$withval]],
+ [[ARG_CXX_STANDARD=reverting to compiler default]]
)
AC_MSG_CHECKING([which C++ standard to use])
-AS_CASE(["$ARG_STD"],
- ["c++17"|"C++17"], [
- AC_MSG_RESULT([-std=c++17])
- AX_CXX_COMPILE_STDCXX(17, [noext], [mandatory])
- ],
- ["gnu++17"], [
- AC_MSG_RESULT([-std=gnu++17])
- AX_CXX_COMPILE_STDCXX(17, [ext], [mandatory])
- ],
- ["c++14"|"C++14"], [
- AC_MSG_RESULT([-std=c++14])
- AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory])
- ],
- ["gnu++14"], [
- AC_MSG_RESULT([-std=gnu++14])
- AX_CXX_COMPILE_STDCXX(14, [ext], [mandatory])
- ],
- ["gnu++11"], [
- AC_MSG_RESULT([-std=gnu++11])
- AX_CXX_COMPILE_STDCXX_11([ext], [mandatory])
- ],
- [AC_MSG_RESULT([-std=c++11])
- AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])]
-)
+if test "x${ARG_CXX_STANDARD}" = "x17" ; then
+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [setcxx])
+elif test "x${ARG_CXX_STANDARD}" = "x14" ; then
+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [setcxx])
+elif test "x${ARG_CXX_STANDARD}" = "x11" ; then
+ AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [setcxx])
+else
+ dnl nothing specified so use compiler's default C++ dialect
+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [])
+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [])
+ AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [])
+ if test "x${HAVE_CXX17}" = "x1" ; then
+ CXX="$CXX -std=c++17"
+ if test -n "$CXXCPP" ; then
+ CXXCPP="$CXXCPP -std=c++17"
+ fi
+ elif test "x${HAVE_CXX14}" = "x1" ; then
+ CXX="$CXX -std=c++14"
+ if test -n "$CXXCPP" ; then
+ CXXCPP="$CXXCPP -std=c++14"
+ fi
+ else
+ CXX="$CXX -std=c++11"
+ if test -n "$CXXCPP" ; then
+ CXXCPP="$CXXCPP -std=c++11"
+ fi
+ fi
+fi
AX_BOOST_SYSTEM()
AS_IF([test -z "$BOOST_SYSTEM_LIB"],
@@ -623,7 +627,7 @@ Build options:
debug build: ${ARG_ENABLE_DEBUG:-no}
invariant checks: ${ARG_ENABLE_INVARIANT:-no}
logging support: ${ARG_ENABLE_LOGGING:-yes}
- with std: ${ARG_STD:-c++11}
+ with std: ${ARG_CXX_STANDARD:-default}
Features:
encryption support: ${ARG_ENABLE_ENCRYPTION:-yes}
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
index 43087b2e68..69989d59d7 100644
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -4,7 +4,7 @@
#
# SYNOPSIS
#
-# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
+# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional], [setcxx])
#
# DESCRIPTION
#
@@ -25,6 +25,12 @@
# regardless, after defining HAVE_CXX${VERSION} if and only if a
# supporting mode is found.
#
+# The fourth argument, if left unspecified, skips over setting the various
+# -std combinations and skips over setting CXX and CXXCPP. If specified
+# 'setcxx' it will restore the default behavior. This argument is augmented
+# for libtorrent-rasterbar and does not exist in the stock m4 interface.
+# Skipping over setting CXX is useful for detecting the default C++ dialect.
+#
# LICENSE
#
# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
@@ -69,17 +75,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
$cachevar,
- [ac_save_CXX="$CXX"
- CXX="$CXX $switch"
+ [ifelse([$4], [setcxx], [ac_save_CXX="$CXX" CXX="$CXX $switch"], [])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[eval $cachevar=yes],
[eval $cachevar=no])
- CXX="$ac_save_CXX"])
+ ifelse([$4], [setcxx], [CXX="$ac_save_CXX"], [])])
if eval test x\$$cachevar = xyes; then
- CXX="$CXX $switch"
- if test -n "$CXXCPP" ; then
- CXXCPP="$CXXCPP $switch"
- fi
+ ifelse([$4], [setcxx],
+ [CXX="$CXX $switch"
+ if test -n "$CXXCPP" ; then
+ CXXCPP="$CXXCPP $switch"
+ fi], [])
ac_success=yes
break
fi
@@ -96,17 +102,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
$cachevar,
- [ac_save_CXX="$CXX"
- CXX="$CXX $switch"
+ [ifelse([$4], [setcxx], [ac_save_CXX="$CXX" CXX="$CXX $switch"], [])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[eval $cachevar=yes],
[eval $cachevar=no])
- CXX="$ac_save_CXX"])
+ ifelse([$4], [setcxx], [CXX="$ac_save_CXX"], [])])
if eval test x\$$cachevar = xyes; then
- CXX="$CXX $switch"
- if test -n "$CXXCPP" ; then
- CXXCPP="$CXXCPP $switch"
- fi
+ ifelse([$4], [setcxx],
+ [CXX="$CXX $switch"
+ if test -n "$CXXCPP" ; then
+ CXXCPP="$CXXCPP $switch"
+ fi], [])
ac_success=yes
break
fi
From e7aeeaabd0ec6f623fd94d348e6db9312cb727c2 Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@berkeley.edu>
Date: Sat, 22 Aug 2020 09:29:12 +0000
Subject: [PATCH 06/10] typo with naming
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 2f0a4326f2..7e48078a7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,7 +147,7 @@ AX_BOOST_BASE([1.58])
AC_ARG_WITH(
[cxx-standard],
[AS_HELP_STRING(
- [--with-cxx-std[=ARG]],
+ [--with-cxx-standard[=ARG]],
[specify C++ standard (e.g., 11, 14 or 17) [default=11]])],
[[ARG_CXX_STANDARD=$withval]],
[[ARG_CXX_STANDARD=reverting to compiler default]]
From 9b45e622d4a815d31f50f5e4fba6e4316fe14272 Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@berkeley.edu>
Date: Sat, 22 Aug 2020 20:55:20 +0000
Subject: [PATCH 07/10] invert behavior and be explicit with 'skip' argument
The 4th argument left unspecified means default behavior. 'skip' means to
skip setting CXX as should be done when detecting the default compiler.
---
configure.ac | 12 ++++++------
m4/ax_cxx_compile_stdcxx.m4 | 39 +++++++++++++++++++++----------------
2 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7e48078a7c..59b0d6603b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,16 +155,16 @@ AC_ARG_WITH(
AC_MSG_CHECKING([which C++ standard to use])
if test "x${ARG_CXX_STANDARD}" = "x17" ; then
- AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [setcxx])
+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [])
elif test "x${ARG_CXX_STANDARD}" = "x14" ; then
- AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [setcxx])
+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [])
elif test "x${ARG_CXX_STANDARD}" = "x11" ; then
- AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [setcxx])
+ AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [])
else
dnl nothing specified so use compiler's default C++ dialect
- AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [])
- AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [])
- AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [])
+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [skip])
+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [skip])
+ AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [skip])
if test "x${HAVE_CXX17}" = "x1" ; then
CXX="$CXX -std=c++17"
if test -n "$CXXCPP" ; then
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
index 69989d59d7..50859df211 100644
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -4,7 +4,7 @@
#
# SYNOPSIS
#
-# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional], [setcxx])
+# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional], [skip])
#
# DESCRIPTION
#
@@ -25,11 +25,11 @@
# regardless, after defining HAVE_CXX${VERSION} if and only if a
# supporting mode is found.
#
-# The fourth argument, if left unspecified, skips over setting the various
-# -std combinations and skips over setting CXX and CXXCPP. If specified
-# 'setcxx' it will restore the default behavior. This argument is augmented
-# for libtorrent-rasterbar and does not exist in the stock m4 interface.
-# Skipping over setting CXX is useful for detecting the default C++ dialect.
+# The fourth argument, if left unspecified, does the default behavior. If
+# specified 'skip', it skips over setting the various -std combinations
+# and skips over setting CXX and CXXCPP. This argument is augmented for
+# libtorrent-rasterbar and does not exist in the stock m4 interface.
+# Skipping is useful for detecting the default C++ dialect.
#
# LICENSE
#
@@ -65,6 +65,9 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
[$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
[$3], [optional], [ax_cxx_compile_cxx$1_required=false],
[m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
+ m4_if([$4], [], [],
+ [$4], [skip], [],
+ [m4_fatal([invalid second argument `$4' to AX_CXX_COMPILE_STDCXX])])dnl
AC_LANG_PUSH([C++])dnl
ac_success=no
@@ -75,17 +78,18 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
$cachevar,
- [ifelse([$4], [setcxx], [ac_save_CXX="$CXX" CXX="$CXX $switch"], [])
+ [ifelse([$4], [skip], [], [ac_save_CXX="$CXX" CXX="$CXX $switch"])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[eval $cachevar=yes],
[eval $cachevar=no])
- ifelse([$4], [setcxx], [CXX="$ac_save_CXX"], [])])
+ ifelse([$4], [skip], [], [CXX="$ac_save_CXX"])])
if eval test x\$$cachevar = xyes; then
- ifelse([$4], [setcxx],
+ ifelse([$4], [skip],
+ [],
[CXX="$CXX $switch"
if test -n "$CXXCPP" ; then
CXXCPP="$CXXCPP $switch"
- fi], [])
+ fi])
ac_success=yes
break
fi
@@ -102,17 +106,18 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
$cachevar,
- [ifelse([$4], [setcxx], [ac_save_CXX="$CXX" CXX="$CXX $switch"], [])
+ [ifelse([$4], [skip], [], [ac_save_CXX="$CXX" CXX="$CXX $switch"])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[eval $cachevar=yes],
[eval $cachevar=no])
- ifelse([$4], [setcxx], [CXX="$ac_save_CXX"], [])])
+ ifelse([$4], [skip], [], [CXX="$ac_save_CXX"])])
if eval test x\$$cachevar = xyes; then
- ifelse([$4], [setcxx],
- [CXX="$CXX $switch"
- if test -n "$CXXCPP" ; then
- CXXCPP="$CXXCPP $switch"
- fi], [])
+ ifelse([$4], [skip],
+ [],
+ [CXX="$CXX $switch"
+ if test -n "$CXXCPP" ; then
+ CXXCPP="$CXXCPP $switch"
+ fi])
ac_success=yes
break
fi
From 9c0a31ffb974a11a3ea00f96cfe45616cf75bcf4 Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@berkeley.edu>
Date: Fri, 25 Sep 2020 09:30:52 +0000
Subject: [PATCH 08/10] revert ax_cxx_compile_stdcxx.m4 to default
---
configure.ac | 53 ++++++++++++++++++++-----------------
m4/ax_cxx_compile_stdcxx.m4 | 41 +++++++++++-----------------
2 files changed, 44 insertions(+), 50 deletions(-)
diff --git a/configure.ac b/configure.ac
index 59b0d6603b..b7eee17d99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,36 +150,41 @@ AC_ARG_WITH(
[--with-cxx-standard[=ARG]],
[specify C++ standard (e.g., 11, 14 or 17) [default=11]])],
[[ARG_CXX_STANDARD=$withval]],
- [[ARG_CXX_STANDARD=reverting to compiler default]]
+ [[ARG_CXX_STANDARD=default]]
)
-AC_MSG_CHECKING([which C++ standard to use])
+AC_MSG_CHECKING([which c++ standard to use])
if test "x${ARG_CXX_STANDARD}" = "x17" ; then
- AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [])
+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional])
elif test "x${ARG_CXX_STANDARD}" = "x14" ; then
- AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [])
+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional])
elif test "x${ARG_CXX_STANDARD}" = "x11" ; then
- AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [])
+ AX_CXX_COMPILE_STDCXX_11([noext], [optional])
+elif test "${ARG_CXX_STANDARD}" -lt "11" ; then
+ dnl force 11 if user specified out of bounds, regardless of compiler default
+ ARG_CXX_STANDARD="11"
+ AX_CXX_COMPILE_STDCXX_11([noext], [optional])
+elif test "${ARG_CXX_STANDARD}" -gt "17" ; then
+ dnl force 11 if user specified out of bounds, regardless of compiler default
+ ARG_CXX_STANDARD="11"
+ AX_CXX_COMPILE_STDCXX_11([noext], [optional])
else
- dnl nothing specified so use compiler's default C++ dialect
- AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [skip])
- AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [skip])
- AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [skip])
- if test "x${HAVE_CXX17}" = "x1" ; then
- CXX="$CXX -std=c++17"
- if test -n "$CXXCPP" ; then
- CXXCPP="$CXXCPP -std=c++17"
- fi
- elif test "x${HAVE_CXX14}" = "x1" ; then
- CXX="$CXX -std=c++14"
- if test -n "$CXXCPP" ; then
- CXXCPP="$CXXCPP -std=c++14"
- fi
+ dnl nothing specified so use compiler default
+
+ echo '#include <iostream>' > cpp_standard.cpp
+ echo 'using std::cout; using std::endl; int main() { switch (__cplusplus) { case 201103L: cout << 11 << endl; break; case 201402L: cout << 14 << endl; break; case 201703L: cout << 17 << endl; break; default: cout << 1 << endl; } }' >> cpp_standard.cpp
+ ${CXX} cpp_standard.cpp -o cpp_standard
+ DEFAULT_CXX_STANDARD=`./cpp_standard`
+ echo $DEFAULT_CXX_STANDARD
+ if test "x${DEFAULT_CXX_STANDARD}" = "x17" ; then
+ ARG_CXX_STANDARD="17"
+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional])
+ elif test "x${DEFAULT_CXX_STANDARD}" = "x14" ; then
+ ARG_CXX_STANDARD="14"
+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional])
else
- CXX="$CXX -std=c++11"
- if test -n "$CXXCPP" ; then
- CXXCPP="$CXXCPP -std=c++11"
- fi
+ ARG_CXX_STANDARD="11"
+ AX_CXX_COMPILE_STDCXX_11([noext], [optional])
fi
fi
@@ -627,7 +632,7 @@ Build options:
debug build: ${ARG_ENABLE_DEBUG:-no}
invariant checks: ${ARG_ENABLE_INVARIANT:-no}
logging support: ${ARG_ENABLE_LOGGING:-yes}
- with std: ${ARG_CXX_STANDARD:-default}
+ cxx standard: ${ARG_CXX_STANDARD:-default}
Features:
encryption support: ${ARG_ENABLE_ENCRYPTION:-yes}
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
index 50859df211..43087b2e68 100644
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -4,7 +4,7 @@
#
# SYNOPSIS
#
-# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional], [skip])
+# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
#
# DESCRIPTION
#
@@ -25,12 +25,6 @@
# regardless, after defining HAVE_CXX${VERSION} if and only if a
# supporting mode is found.
#
-# The fourth argument, if left unspecified, does the default behavior. If
-# specified 'skip', it skips over setting the various -std combinations
-# and skips over setting CXX and CXXCPP. This argument is augmented for
-# libtorrent-rasterbar and does not exist in the stock m4 interface.
-# Skipping is useful for detecting the default C++ dialect.
-#
# LICENSE
#
# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
@@ -65,9 +59,6 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
[$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
[$3], [optional], [ax_cxx_compile_cxx$1_required=false],
[m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
- m4_if([$4], [], [],
- [$4], [skip], [],
- [m4_fatal([invalid second argument `$4' to AX_CXX_COMPILE_STDCXX])])dnl
AC_LANG_PUSH([C++])dnl
ac_success=no
@@ -78,18 +69,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
$cachevar,
- [ifelse([$4], [skip], [], [ac_save_CXX="$CXX" CXX="$CXX $switch"])
+ [ac_save_CXX="$CXX"
+ CXX="$CXX $switch"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[eval $cachevar=yes],
[eval $cachevar=no])
- ifelse([$4], [skip], [], [CXX="$ac_save_CXX"])])
+ CXX="$ac_save_CXX"])
if eval test x\$$cachevar = xyes; then
- ifelse([$4], [skip],
- [],
- [CXX="$CXX $switch"
- if test -n "$CXXCPP" ; then
- CXXCPP="$CXXCPP $switch"
- fi])
+ CXX="$CXX $switch"
+ if test -n "$CXXCPP" ; then
+ CXXCPP="$CXXCPP $switch"
+ fi
ac_success=yes
break
fi
@@ -106,18 +96,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
$cachevar,
- [ifelse([$4], [skip], [], [ac_save_CXX="$CXX" CXX="$CXX $switch"])
+ [ac_save_CXX="$CXX"
+ CXX="$CXX $switch"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[eval $cachevar=yes],
[eval $cachevar=no])
- ifelse([$4], [skip], [], [CXX="$ac_save_CXX"])])
+ CXX="$ac_save_CXX"])
if eval test x\$$cachevar = xyes; then
- ifelse([$4], [skip],
- [],
- [CXX="$CXX $switch"
- if test -n "$CXXCPP" ; then
- CXXCPP="$CXXCPP $switch"
- fi])
+ CXX="$CXX $switch"
+ if test -n "$CXXCPP" ; then
+ CXXCPP="$CXXCPP $switch"
+ fi
ac_success=yes
break
fi
From 49b4683f484271e394612b80331af39c5a0c36c5 Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@berkeley.edu>
Date: Fri, 25 Sep 2020 23:54:23 +0000
Subject: [PATCH 09/10] mandatory
---
configure.ac | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index b7eee17d99..29c237fa8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,19 +155,19 @@ AC_ARG_WITH(
AC_MSG_CHECKING([which c++ standard to use])
if test "x${ARG_CXX_STANDARD}" = "x17" ; then
- AX_CXX_COMPILE_STDCXX(17, [noext], [optional])
+ AX_CXX_COMPILE_STDCXX(17, [noext], [mandatory])
elif test "x${ARG_CXX_STANDARD}" = "x14" ; then
- AX_CXX_COMPILE_STDCXX(14, [noext], [optional])
+ AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory])
elif test "x${ARG_CXX_STANDARD}" = "x11" ; then
- AX_CXX_COMPILE_STDCXX_11([noext], [optional])
+ AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
elif test "${ARG_CXX_STANDARD}" -lt "11" ; then
dnl force 11 if user specified out of bounds, regardless of compiler default
ARG_CXX_STANDARD="11"
- AX_CXX_COMPILE_STDCXX_11([noext], [optional])
+ AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
elif test "${ARG_CXX_STANDARD}" -gt "17" ; then
dnl force 11 if user specified out of bounds, regardless of compiler default
ARG_CXX_STANDARD="11"
- AX_CXX_COMPILE_STDCXX_11([noext], [optional])
+ AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
else
dnl nothing specified so use compiler default
@@ -178,13 +178,13 @@ else
echo $DEFAULT_CXX_STANDARD
if test "x${DEFAULT_CXX_STANDARD}" = "x17" ; then
ARG_CXX_STANDARD="17"
- AX_CXX_COMPILE_STDCXX(17, [noext], [optional])
+ AX_CXX_COMPILE_STDCXX(17, [noext], [mandatory])
elif test "x${DEFAULT_CXX_STANDARD}" = "x14" ; then
ARG_CXX_STANDARD="14"
- AX_CXX_COMPILE_STDCXX(14, [noext], [optional])
+ AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory])
else
ARG_CXX_STANDARD="11"
- AX_CXX_COMPILE_STDCXX_11([noext], [optional])
+ AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
fi
fi
From a942fa69062f5c1719cc96f8169c175fd6607c93 Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@berkeley.edu>
Date: Sat, 26 Sep 2020 00:51:45 +0000
Subject: [PATCH 10/10] fix bug where unspecified default was not respected If
no --with-cxx-standard is given, there was a bug that resulted in 11 being
incorrectly preferred over the compiler's default. To resolve this make sure
that default is handled by the final else. Ensure it does not fall into the
elif clauses where the user gives an out of bounds standard (< 11 or > 17)
and it clamps it to 11.
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 29c237fa8b..3fa925b1fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,11 +160,11 @@ elif test "x${ARG_CXX_STANDARD}" = "x14" ; then
AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory])
elif test "x${ARG_CXX_STANDARD}" = "x11" ; then
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
-elif test "${ARG_CXX_STANDARD}" -lt "11" ; then
+elif test "x${ARG_CXX_STANDARD}" != "xdefault" -a "${ARG_CXX_STANDARD}" -lt "11" ; then
dnl force 11 if user specified out of bounds, regardless of compiler default
ARG_CXX_STANDARD="11"
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
-elif test "${ARG_CXX_STANDARD}" -gt "17" ; then
+elif test "x${ARG_CXX_STANDARD}" != "xdefault" -a "${ARG_CXX_STANDARD}" -gt "17" ; then
dnl force 11 if user specified out of bounds, regardless of compiler default
ARG_CXX_STANDARD="11"
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])

6
neomutt/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3+/vzu99IRYikqVvFHaUfsVrtiaDbReUyRC48mKown8dapFl65iutDVvD79AAGhDyBra8gHokzx4d3mmjwueaw8=
SHA256 (Pkgfile) = f3f10c9954f3f8e9ce82f034e8d0b5878a9d3366d077f5bdcc03e406904d6ebe
RWSagIOpLGJF3wlOJqtJ/RRnemGtZzz9QdH2V1+g6/+u8/6DYnRdXQkSciYkzf1c08kOSloZORIu6vHUnoLUYsy7s485PfQfNQM=
SHA256 (Pkgfile) = 712fbe015d6dab6442ca9a2b3e5be23092a0ea36454f201cfc9ef9a56f0716d3
SHA256 (.footprint) = 4b8b646e2de76fe03176e42efe0c768c5134d4c6ba4086f0c6c864ae2db092b7
SHA256 (neomutt-20200925.tar.gz) = dcec98ea2454d7695ff92184c33a0051c2b3c46320f81f7889c4580c943140dd
SHA256 (neomutt-20201120.tar.gz) = 48191d4f17cb1e5fd094ca92c581e1bb9599f058c122cc0e35df4e1c0cb53f47

2
neomutt/Pkgfile
View File

@ -5,7 +5,7 @@
# Optional: cyrus-sasl gpgme krb5 lua notmuch
name=neomutt
version=20200925
version=20201120
release=1
source=(https://github.com/neomutt/neomutt/archive/$version/$name-$version.tar.gz)

6
p5-http-cookies/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF356HqY6ireCl0sJvRKoxzzlbnqCD2EORnbfChB7Ob/MS/DaGbMM5kKfPGMfquI+FG2SCHUoM6j5Popn71EjfTws=
SHA256 (Pkgfile) = ebebd85b40d8b5763d0955879ec955979412728f44c48bf252a5e51828c4f507
RWSagIOpLGJF3/5Jt48dlMSRiJVhiRsoP3wHuoS/X6Db5p9GVBFKmhDBhVqsiWpp1NkIzuXqBPk0nDfZz4I5MIDqeWB6namvyQs=
SHA256 (Pkgfile) = e67737ad16f49ff52c2280d8a8a482ef5bfe2be83f17468fadc91194fce1493f
SHA256 (.footprint) = 8834850999e1d1e060e60071f14bef4cc451ac9f457dee85660fc591018485dc
SHA256 (HTTP-Cookies-6.08.tar.gz) = 49ebb73576eb41063c04bc079477df094496deec805ae033f3be338c23c3af59
SHA256 (HTTP-Cookies-6.09.tar.gz) = 903f017afaa5b78599cc90efc14ecccc8cc2ebfb636eb8c02f8f16ba861d1fe0

2
p5-http-cookies/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: p5-http-date p5-http-message
name=p5-http-cookies
version=6.08
version=6.09
release=1
source=(https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Cookies-$version.tar.gz)

2
p5-image-exiftool/.footprint
View File

@ -223,6 +223,7 @@ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Image/ExifTool/Lang/
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Image/ExifTool/XMP2.pl
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Image/ExifTool/XMPStruct.pl
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Image/ExifTool/ZIP.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Image/ExifTool/ZISRAW.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Image/ExifTool/iWork.pm
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/linux-thread-multi/
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/linux-thread-multi/auto/
@ -413,6 +414,7 @@ drwxr-xr-x root/root usr/share/man/man3/
-r--r--r-- root/root usr/share/man/man3/Image::ExifTool::XMP2.3pm.gz
-r--r--r-- root/root usr/share/man/man3/Image::ExifTool::XMPStruct.3pm.gz
-r--r--r-- root/root usr/share/man/man3/Image::ExifTool::ZIP.3pm.gz
-r--r--r-- root/root usr/share/man/man3/Image::ExifTool::ZISRAW.3pm.gz
-r--r--r-- root/root usr/share/man/man3/Image::ExifTool::iWork.3pm.gz
drwxr-xr-x root/root usr/share/p5-image-exiftool/
drwxr-xr-x root/root usr/share/p5-image-exiftool/arg_files/

8
p5-image-exiftool/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF31U1X0jBm3HK+kwEiCmf3JMyfgiMzTMgJ01Fp+8nHaPgSiyOiMuBIrUtPBSGZ188QZv0WmLTe88wT86V0xDemwQ=
SHA256 (Pkgfile) = 56e3f133631cc0ce51084bb10465565341c611db450b8efd629ad846de9f5cfa
SHA256 (.footprint) = 2b240fe2998e0f5c1e6e22b03a598d2bafd9a591ecf3c292c317fd2a780a9954
SHA256 (Image-ExifTool-12.00.tar.gz) = d0792cc94ab58a8b3d81b18ccdb8b43848c8fb901b5b7caecdcb68689c6c855a
RWSagIOpLGJF355fqD2AtMw1zCEboRwvMVyRCJXbCDspvZB1rw1rFVCAucOE6W5L1Pm0SwuOUtifQvK4I4J9jDR5Lj+XQHPm0A8=
SHA256 (Pkgfile) = 2f701f9202784d12687ce3e87fe4d2b01be3e1fc0afc8206fe2e7a26365aebaf
SHA256 (.footprint) = 78fd6ca14fa5000a0d6a003f7f07324f0d754f80ab6cfe17038fec651fc42f82
SHA256 (Image-ExifTool-12.10.tar.gz) = da611df6b25e5f7750ebe34c6b565bb7a4027c4ca209f9de723555f9dc204976

4
p5-image-exiftool/Pkgfile
View File

@ -4,9 +4,9 @@
# Depends on:
name=p5-image-exiftool
version=12.00
version=12.10
release=1
source=(http://search.cpan.org/CPAN/authors/id/E/EX/EXIFTOOL/Image-ExifTool-$version.tar.gz)
source=(https://exiftool.org/Image-ExifTool-$version.tar.gz)
build() {
cd Image-ExifTool-$version

3
padbuster/.footprint Normal file
View File

@ -0,0 +1,3 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/padbuster

7
padbuster/.signature Normal file
View File

@ -0,0 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF38wpRKV0zRH/tvdoNWqa2azugAABlHjC/DAgSoTIXflOoYIrjldfrfUjUJ/z8hdH1b42eubrTe2zIy7uyU7YSAA=
SHA256 (Pkgfile) = 094c67517684ea5d817ef2b1306d59f02becd587a28bc9f1c31993a1953a4a0d
SHA256 (.footprint) = 136f22206ecbeb2836ef0c6cd360ec4031656a06727f42149d1323657e89985f
SHA256 (PadBuster-94460ff70218d39a858fb941e7936283f347cf52.zip) = 94799ae09589cb955836a74883d7a70870c3730c4d3dc5fa541f9bd4b1db8224
SHA256 (0001-padBuster.pl-remove-unnecessary-Crypt-SSLeay.patch) = f54fceb8fee0a784860e0e107e4f3bddfb648e7037caef3618e00c570cfa9e7c
SHA256 (0002-padBuster.pl-improve-help-message.patch) = f3f6bc3addf62442f215b0037b93a5006fa01a08bc7bed32c535a9ab8ec607d3

30
padbuster/0001-padBuster.pl-remove-unnecessary-Crypt-SSLeay.patch Normal file
View File

@ -0,0 +1,30 @@
From 1e1fd9b2c030f0fb9caaf585b013f70b599dc50f Mon Sep 17 00:00:00 2001
From: Alexandr Savca <alexandrsavca89@gmail.com>
Date: Sun, 4 Oct 2020 18:34:15 +0300
Subject: [PATCH 1/2] padBuster.pl: remove unnecessary Crypt::SSLeay
Starting with version 6.02 of LWP, https support was unbundled into
LWP::Protocol::https. This module specifies as one of its prerequisites
IO::Socket::SSL which is automatically used by LWP::UserAgent unless this
preference is overridden separately. IO::Socket::SSL is a more complete
implementation, and, crucially, it allows hostname verification.
Crypt::SSLeay does not support this.
---
padBuster.pl | 1 -
1 file changed, 1 deletion(-)
diff --git a/padBuster.pl b/padBuster.pl
index 95bd5bd..6ab6f25 100755
--- a/padBuster.pl
+++ b/padBuster.pl
@@ -20,7 +20,6 @@ use URI::Escape;
use Getopt::Long;
use Time::HiRes qw( gettimeofday );
use Compress::Zlib;
-use Crypt::SSLeay;
use File::Basename qw(dirname);
use File::Path qw(make_path);
--
2.28.0

57
padbuster/0002-padBuster.pl-improve-help-message.patch Normal file
View File

@ -0,0 +1,57 @@
From 5de8a7c03ca115c5f976cad8fba7428fadae7d78 Mon Sep 17 00:00:00 2001
From: Alexandr Savca <alexandrsavca89@gmail.com>
Date: Sun, 4 Oct 2020 19:03:31 +0300
Subject: [PATCH 2/2] padBuster.pl: improve help message
---
padBuster.pl | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/padBuster.pl b/padBuster.pl
index 6ab6f25..33aa5da 100755
--- a/padBuster.pl
+++ b/padBuster.pl
@@ -20,7 +20,7 @@ use URI::Escape;
use Getopt::Long;
use Time::HiRes qw( gettimeofday );
use Compress::Zlib;
-use File::Basename qw(dirname);
+use File::Basename qw(basename dirname);
use File::Path qw(make_path);
# Set defaults with $variable = value
@@ -92,7 +92,7 @@ print "+-------------------------------------------+\n";
if ($#ARGV < 2) {
die "
- Use: padBuster.pl URL EncryptedSample BlockSize [options]
+ Use: @{[basename $0]} URL EncryptedSample BlockSize [options]
Where: URL = The target URL (and query string if applicable)
EncryptedSample = The encrypted value you want to test. Must
@@ -130,7 +130,21 @@ Options:
-runafter [cmd]: Command to run after finished encryption (replaces #ENC, #DIR)
-verbose: Be Verbose
-veryverbose: Be Very Verbose (Debug Only)
-
+
+Environment variables:
+
+ PERL_LWP_SSL_VERIFY_HOSTNAME
+ When 1 padBuster.pl will for secure protocol schemes ensure it connects to
+ servers that have a valid certificate matching the expected hostname.
+ If 0 no checks are made and you can't be sure that you communicate with the
+ expected peer. By default - 1.
+
+ PERL_LWP_SSL_CA_FILE, HTTPS_CA_FILE
+ The path to a file containing Certificate Authority certificates.
+
+ PERL_LWP_SSL_CA_PATH, HTTPS_CA_DIR
+ The path to a directory containing files containing Certificate Authority
+ certificates.
";}
# Ok, if we've made it this far we are ready to begin..
--
2.28.0

22
padbuster/Pkgfile Normal file
View File

@ -0,0 +1,22 @@
# Description: Performing Padding Oracle attacks (GW Fork)
# URL: https://github.com/gw0/PadBuster.git
# Maintainer: Alexandr Savca, alexandrsavca89 at gmail dot com
# Depends on: p5-libwww p5-lwp-protocol-https
name=padbuster
version=0.3.3.94460ff
_commit=94460ff70218d39a858fb941e7936283f347cf52
release=1
source=(https://github.com/gw0/PadBuster/archive/$_commit/PadBuster-$_commit.zip
0001-padBuster.pl-remove-unnecessary-Crypt-SSLeay.patch
0002-padBuster.pl-improve-help-message.patch)
build() {
cd PadBuster-$_commit
patch -p1 < $SRC/0001-padBuster.pl-remove-unnecessary-Crypt-SSLeay.patch
patch -p1 < $SRC/0002-padBuster.pl-improve-help-message.patch
#install -dm755 autoBuster.sh $PKG/usr/bin/autobuster
install -Dm755 padBuster.pl $PKG/usr/bin/padbuster
}

8
pandoc-bin/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF33ICye3jje1iRksbz5i2LkMAVf3oY0pJAUWjnKS5yQHiuzJpjU68vSLIGeBWVhV2/bpluwpbwvbGC4bpAZ5WWgY=
SHA256 (Pkgfile) = 32acb811dfe5bf7b4afa32286dad196f8257cb095574a08d13e307c194de5131
RWSagIOpLGJF3+YL89yAsb57u8UehqO5j0Gheuji2qE8/R8p+kEtbB9y/GCl3L2lT4al9ikYP8XXNM/7nw5vavedKC/IWlWtPgw=
SHA256 (Pkgfile) = 4ae573183678e0bd2da47a297de57d4e60e0d916e55bd10294f55af6caa788fa
SHA256 (.footprint) = a1b826283dfe9591acd51ad58fdf26256cc03aeb85305f0e8fbc84936abbefe3
SHA256 (pandoc-2.11.1.1-linux-amd64.tar.gz) = b2f0a23519477c9b83aebefe71dd02d3b342a668e9fea00202e34864654f34f7
SHA256 (pandoc-2.11.1.1.tar.gz) = c024b3102f4f3419f0f50622735d471cb1e98559195f1f4df53a0a7504f6e468
SHA256 (pandoc-2.11.2-linux-amd64.tar.gz) = 25e4055db5144289dc45e7c5fb3616ea5cf75f460eba337b65474d9fbc40c0fb
SHA256 (pandoc-2.11.2.tar.gz) = c7b01564548c232b239170f2d5009a2395599e9e275c1bad4f6408f1206e2f8f

2
pandoc-bin/Pkgfile
View File

@ -5,7 +5,7 @@
# Optional: texlive
name=pandoc-bin
version=2.11.1.1
version=2.11.2
release=1
source=(https://github.com/jgm/pandoc/releases/download/$version/pandoc-$version-linux-amd64.tar.gz
https://github.com/jgm/pandoc/archive/$version/pandoc-$version.tar.gz)

35
perltidy/.footprint Normal file
View File

@ -0,0 +1,35 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-r-xr-xr-x root/root usr/bin/perltidy
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/perl5/
drwxr-xr-x root/root usr/lib/perl5/site_perl/
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Perl/
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy.pod
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/Debugger.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/DevNull.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/Diagnostics.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/FileWriter.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/Formatter.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/HtmlWriter.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/IOScalar.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/IOScalarArray.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/IndentationItem.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/LineBuffer.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/LineSink.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/LineSource.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/Logger.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/Tokenizer.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/VerticalAligner.pm
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/VerticalAligner/
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/VerticalAligner/Alignment.pm
-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Perl/Tidy/VerticalAligner/Line.pm
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-r--r--r-- root/root usr/share/man/man1/perltidy.1pm.gz
drwxr-xr-x root/root usr/share/man/man3/
-r--r--r-- root/root usr/share/man/man3/Perl::Tidy.3pm.gz

5
perltidy/.signature Normal file
View File

@ -0,0 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3+ImfpqT9kbrEmZY9M5cExAtP7qYU16XafeHMze0J3ivs3WnyJ+Xj4NfeFCH1Oc9AVj7K1LMoJfYvpDipP1bDQ8=
SHA256 (Pkgfile) = 31205f9cd95966d64948d575549522bcda5ceb493b67abae39968f0fac8e20d5
SHA256 (.footprint) = d778bccc138bcfb39051e16e6c48f33ab08b381cfc972fb2b3a439a9cddfb720
SHA256 (Perl-Tidy-20201001.tar.gz) = 0873ebb300239d792fb8e67164b0e04bb8fb1ff153659630d321c0b4a1dc9a12

27
perltidy/Pkgfile Normal file
View File

@ -0,0 +1,27 @@
# Description: Perl script indenter and reformatter
# URL: https://metacpan.org/release/Perl-Tidy
# Maintainer: Alexandr Savca, alexandrsavca89 at gmail dot com
name=perltidy
version=20201001
release=1
source=(https://cpan.metacpan.org/authors/id/S/SH/SHANCOCK/Perl-Tidy-$version.tar.gz)
build() {
cd Perl-Tidy-$version
perl Makefile.PL
make
make DESTDIR=$PKG install
# remove perlcrap
find $PKG -name perllocal.pod \
-o -name "*.bs" \
-o -name .packlist \
-o -name autosplit.ix \
| xargs rm -f
# remove empty dirs
find $PKG -depth -type d -empty -delete
}

5
pipewire/.footprint
View File

@ -8,6 +8,7 @@ drwxr-xr-x root/root lib/udev/rules.d/
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/pipewire
-rwxr-xr-x root/root usr/bin/pipewire-pulse
-rwxr-xr-x root/root usr/bin/pw-cli
-rwxr-xr-x root/root usr/bin/pw-dot
-rwxr-xr-x root/root usr/bin/pw-metadata
@ -162,8 +163,8 @@ drwxr-xr-x root/root usr/lib/alsa-lib/
-rwxr-xr-x root/root usr/lib/alsa-lib/libasound_module_ctl_pipewire.so
-rwxr-xr-x root/root usr/lib/alsa-lib/libasound_module_pcm_pipewire.so
lrwxrwxrwx root/root usr/lib/libpipewire-0.3.so -> libpipewire-0.3.so.0
lrwxrwxrwx root/root usr/lib/libpipewire-0.3.so.0 -> libpipewire-0.3.so.0.315.0
-rwxr-xr-x root/root usr/lib/libpipewire-0.3.so.0.315.0
lrwxrwxrwx root/root usr/lib/libpipewire-0.3.so.0 -> libpipewire-0.3.so.0.316.0
-rwxr-xr-x root/root usr/lib/libpipewire-0.3.so.0.316.0
drwxr-xr-x root/root usr/lib/pipewire-0.3/
-rwxr-xr-x root/root usr/lib/pipewire-0.3/libpipewire-module-access.so
-rwxr-xr-x root/root usr/lib/pipewire-0.3/libpipewire-module-adapter.so

8
pipewire/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF31KpyxKbGgkQ55O/VHYxkXUceeDpto57wAMCA4ppEONKzEuAtIQtMFnu+k9ZLKbQyf5UHLmrAk6/gxLR9QH8ZQE=
SHA256 (Pkgfile) = e7fb7dc9d806733cfa54ed2ddc9488a2c5f298f9b8550efa4236e8e4dc7e1902
SHA256 (.footprint) = f72d281b81afec662acd5f6b44718960a6b07604cea647920b3f645643c9018e
SHA256 (pipewire-0.3.15.tar.gz) = 659bf2baeb5bb783b141b1b9d14da72865d3e84073b3e85503ac119a6813aa2a
RWSagIOpLGJF3zx6F+o0eyWOtnWziyObQsr5zX/CpIiaeBdax2sh+aCReW4qDZAfajVqM5g+wV/IbDyXQ/wdhJY18IhnbSgkvQw=
SHA256 (Pkgfile) = 22585220173fe0eebc30bd65f277ee8e1b3b54dd798101f0861927e71d3dbb65
SHA256 (.footprint) = 18ca28805da968a2a925733b5ef0c1d2561444f09001bb3fce2b05968dbce679
SHA256 (pipewire-0.3.16.tar.gz) = da9bb247b767779cafb80e69c6eb6ee60f92b883605df2e14838d10b4e4963c3

2
pipewire/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: alsa-lib dbus fdk-aac ffmpeg glib gnutls lame libva libvpx libwebp x264 x265
name=pipewire
version=0.3.15
version=0.3.16
release=1
source=(https://github.com/PipeWire/pipewire/archive/$version/$name-$version.tar.gz)

7
pixiewps/.footprint Normal file
View File

@ -0,0 +1,7 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/pixiewps
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/pixiewps.1.gz

5
pixiewps/.signature Normal file
View File

@ -0,0 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF39eWPCagqEjimt6ZKGjLs8OHHNGiFyLJ4QtJTIaS6+IiDDMhfQE8vVfW3PtVKmPyiLTc3ymPvQDHiGl2QaR21AI=
SHA256 (Pkgfile) = 97b97f21460855249a6ec392e766f74bda044e6fa2a69890c17550bb7f67854e
SHA256 (.footprint) = 1e6028018da4c8a69892341c44e478e6287644860a0c605c37b27085d507c57a
SHA256 (pixiewps-1.4.2.tar.gz) = c73ffd58c461a88504cca36e5a29981dc68b78f8fdd31d7c546bc204fad7c435

18
pixiewps/Pkgfile Normal file
View File

@ -0,0 +1,18 @@
# Description: Bruteforce offline the WPS PIN
# URL: https://github.com/wiire-a/pixiewps
# Maintainer: Alexandr Savca, alexandrsavca89 at gmail dot com
# Depends on: openssl
name=pixiewps
version=1.4.2
release=1
source=(https://github.com/wiire-a/$name/archive/v$version/$name-$version.tar.gz)
build() {
cd $name-$version
make OPENSSL=1 CFLAGS="${CFLAGS}"
make DESTDIR=$PKG PREFIX=/usr install
install -Dm644 $name.1 -t $PKG/usr/share/man/man1
}

12
python3-pygments/.footprint
View File

@ -5,12 +5,12 @@ drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/python3.9/
drwxr-xr-x root/root usr/lib/python3.9/site-packages/
drwxr-xr-x root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/
-rwxrwxrwx root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/PKG-INFO
-rwxrwxrwx root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/SOURCES.txt
-rwxrwxrwx root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/dependency_links.txt
-rwxrwxrwx root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/entry_points.txt
-rwxrwxrwx root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/not-zip-safe
-rwxrwxrwx root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/top_level.txt
-rwxrwxr-x root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/PKG-INFO
-rwxrwxr-x root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/SOURCES.txt
-rwxrwxr-x root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/dependency_links.txt
-rwxrwxr-x root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/entry_points.txt
-rwxrwxr-x root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/not-zip-safe
-rwxrwxr-x root/root usr/lib/python3.9/site-packages/Pygments-2.7.2-py3.9.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python3.9/site-packages/pygments/
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pygments/__init__.py
-rw-r--r-- root/root usr/lib/python3.9/site-packages/pygments/__main__.py

6
python3-pygments/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3+vzro/qTqsTFzsdKW4jv9HRI8r6oxjWiimiY5j8MZHVKqUXFj73Vraa5qn8ffsz9K8jscvVP+jzmmkuBJlxUgM=
SHA256 (Pkgfile) = 9cda8ef0f3d16f6c5c7f31094ebedb27ac173db590da7191c38db54a6cfb9968
SHA256 (.footprint) = bba7c2d8590c5d8ce8ab6e9c365a2ce870713690911a34b2a5f27cfee97000e6
RWSagIOpLGJF397AKOTJ4DOWq80KJc8unNX0kN2+x12XHiZPPqFqC25bt0Jzr4OWBiKquFrdwYmAiYa84acmL+fGhYJeo6YQ8go=
SHA256 (Pkgfile) = 3c4067a747eb696b60af84fd4ed1498d89500ad6c92fe8d27ad9a8e738834a85
SHA256 (.footprint) = 189ebbea9a03014d7d240a40804d0d34818a40e2fcb39b2950158b82aacece27
SHA256 (Pygments-2.7.2.tar.gz) = 381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0

5
python3-pygments/Pkgfile
View File

@ -5,7 +5,7 @@
name=python3-pygments
version=2.7.2
release=1
release=2
source=(https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-$version.tar.gz)
build() {
@ -13,4 +13,7 @@ build() {
/usr/bin/python3 setup.py build
/usr/bin/python3 setup.py install --prefix=/usr --root=$PKG
# why setuptools why?
find $PKG/usr/lib/python3.9/site-packages -type f -exec chmod o-w '{}' \+
}

12
wordlistctl/.footprint Normal file
View File

@ -0,0 +1,12 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/wordlistctl
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/bash-completion/
drwxr-xr-x root/root usr/share/bash-completion/completions/
-rw-r--r-- root/root usr/share/bash-completion/completions/wordlistctl
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/wordlistctl.1.gz
drwxr-xr-x root/root usr/share/wordlistctl/
-rw-r--r-- root/root usr/share/wordlistctl/repo.json

7
wordlistctl/.signature Normal file
View File

@ -0,0 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF39eh8RDqEJ+8TT5DbW17SVrkihVzkPzcw4ZU+ytz+VncmkPchRMGj2cw4kjNzau0ArwYhj/+u5kYDxJMy5AQqgQ=
SHA256 (Pkgfile) = b9f84ebbba4f6fb0c756dc18baa97a214f260d3e86d4a1e32e66d941e13d6302
SHA256 (.footprint) = 4975c8f87d55e610b6ad0d08a4cf81a55bfc186bf9b22bc4bfa65faf3d23588c
SHA256 (wordlistctl-0.9.0.tar.gz) = 75803087826ec57ff6120e3d7870dcb85375d59f62696ebab3b0e63eef24956f
SHA256 (0001-remove-unnecessary-termcolor-dependency.patch) = 647eccfc4ac68d13a6683b00abdc9339eba33b39f79925095db7441351060432
SHA256 (0001-fix-repo.json-path.patch) = 3c5879bb189f8e9e285b12cbbecc8f765abc96940ae1e727760816151c34f476

25
wordlistctl/0001-fix-repo.json-path.patch Normal file
View File

@ -0,0 +1,25 @@
From be6fd8fb033cdcdba91cc3f4e452964229493675 Mon Sep 17 00:00:00 2001
From: Alexandr Savca <alexandrsavca89@gmail.com>
Date: Thu, 24 Sep 2020 11:19:50 +0300
Subject: [PATCH] fix repo.json path
---
wordlistctl.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wordlistctl.py b/wordlistctl.py
index 92e0738..f986ee9 100755
--- a/wordlistctl.py
+++ b/wordlistctl.py
@@ -64,7 +64,7 @@ def banner() -> None:
def load_repo() -> None:
global REPOSITORY
- repofile: str = f"{os.path.dirname(os.path.realpath(__file__))}/repo.json"
+ repofile: str = "/usr/share/wordlistctl/repo.json"
try:
if not os.path.isfile(repofile):
raise FileNotFoundError("repository file not found")
--
2.28.0

55
wordlistctl/0001-remove-unnecessary-termcolor-dependency.patch Normal file
View File

@ -0,0 +1,55 @@
From 0c71afede9c3c26e6080f9bf532a012d886e3e10 Mon Sep 17 00:00:00 2001
From: Alexandr Savca <alexandrsavca89@gmail.com>
Date: Thu, 24 Sep 2020 11:05:23 +0300
Subject: [PATCH] remove unnecessary termcolor dependency
---
wordlistctl.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/wordlistctl.py b/wordlistctl.py
index d87f3d1..92e0738 100755
--- a/wordlistctl.py
+++ b/wordlistctl.py
@@ -24,7 +24,6 @@ from concurrent.futures import ThreadPoolExecutor
try:
import requests
- from termcolor import colored
except Exception as ex:
print(f"[-] {ex}", file=sys.stderr)
sys.exit(-1)
@@ -44,25 +43,23 @@ RETRY_COUNT: int = 5
def error(string: str) -> None:
- print(colored("[-]", "red", attrs=["bold"]) +
- f" {string}", file=sys.stderr)
+ print(f"[-] {string}", file=sys.stderr)
def warning(string: str) -> None:
- print(colored("[!]", "yellow", attrs=["bold"]) + f" {string}")
+ print(f"[!] {string}")
def info(string: str) -> None:
- print(colored("[*]", "blue", attrs=["bold"]) + f" {string}")
+ print(f"[*] {string}")
def success(string: str) -> None:
- print(colored("[+]", "green", attrs=["bold"]) + f" {string}")
+ print(f"[+] {string}")
def banner() -> None:
- print(colored(f"--==[ {__project__} by {__organization__} ]==--\n",
- "red", attrs=["bold"]))
+ print(f"--==[ {__project__} by {__organization__} ]==--\n")
def load_repo() -> None:
--
2.28.0

25
wordlistctl/Pkgfile Normal file
View File

@ -0,0 +1,25 @@
# Description: Fetch, install and search wordlist archives from websites
# URL: https://github.com/BlackArch/wordlistctl
# Maintainer: Alexandr Savca, alexandrsavca89 at gmail dot com
# Depends on: python3-requests
name=wordlistctl
version=0.9.0
release=1
source=(https://github.com/BlackArch/$name/archive/v$version/$name-$version.tar.gz
0001-remove-unnecessary-termcolor-dependency.patch
0001-fix-repo.json-path.patch)
build() {
cd $name-$version
patch -p1 < $SRC/0001-remove-unnecessary-termcolor-dependency.patch
patch -p1 < $SRC/0001-fix-repo.json-path.patch
install -pDm644 bash-completion/$name \
$PKG/usr/share/bash-completion/completions/$name
install -pDm644 man/$name.1 $PKG/usr/share/man/man1/$name.1
install -pDm755 wordlistctl.py $PKG/usr/bin/$name
install -pDm644 repo.json -t $PKG/usr/share/$name
}

4
wordlistctl/post-install Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
if [ ! -e /etc/ssl/certs/ca-certificates.crt ]; then
ln -s /etc/ssl/cert.pem /etc/ssl/certs/ca-certificates.crt
fi