Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (496bd2ad8d3f727534b461ce0312288b0747a9a2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (496bd2ad8d3f727534b461ce0312288b0747a9a2)
  • Date: Thu, 29 Mar 2018 23:05:34 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog
| 10
crypto/keepassxc/DEPENDS
| 1
crypto/keepassxc/HISTORY
| 3
crypto/openssl/DETAILS
| 4
crypto/openssl/HISTORY
| 3
devel/vala/DETAILS
| 4
devel/vala/HISTORY
| 3
disk/eudev/DETAILS
| 1
disk/eudev/FINAL
| 3
disk/eudev/HISTORY
| 4
editors/vim/DETAILS
| 4
editors/vim/HISTORY
| 3
gnome3-libs/pygobject3/DETAILS
| 4
gnome3-libs/pygobject3/HISTORY
| 3
graphics-libs/gegl/DETAILS
| 4
graphics-libs/gegl/HISTORY
| 3
graphics-libs/libraw/DETAILS
| 8
graphics-libs/libraw/HISTORY
| 3
graphics/darktable/DETAILS
| 4
graphics/darktable/HISTORY
| 3
http/firefox-esr/DETAILS
| 6
http/firefox-esr/HISTORY
| 3
http/newsbeuter/0001-compability-fix-for-ncurses-6.patch
| 25
http/newsbeuter/BUILD
| 2
http/newsbeuter/DEPENDS
| 15
http/newsbeuter/DETAILS
| 35
http/newsbeuter/DOWNLOAD
| 1
http/newsbeuter/HISTORY
| 5
http/newsbeuter/INSTALL
| 2
http/newsbeuter/PRE_BUILD
| 12
http/newsbeuter/TRIGGERS
| 1
http/newsbeuter/escape.patch
| 23
http/newsboat/0001-fix-compile-error.patch
| 39
http/newsboat/DEPENDS
| 2
http/newsboat/DETAILS
| 2
http/newsboat/HISTORY
| 6
http/newsboat/PRE_BUILD
| 5
http/newsboat/boost_regex.patch
| 22
http/newsboat/gcc46.patch
| 930 ----------
libs/icu/DETAILS
| 6
libs/icu/HISTORY
| 4
libs/icu/PRE_BUILD
| 6
libs/icu/collation.patch
| 124 -
libs/icu/xlocale.patch
| 31
libs/json-for-modern-cpp/BUILD
| 2
libs/json-for-modern-cpp/DETAILS
| 31
libs/json-for-modern-cpp/HISTORY
| 3
libs/libusb/DETAILS
| 4
libs/libusb/HISTORY
| 3
net/crda/BUILD
| 9
net/crda/DEPENDS
| 5
net/crda/DETAILS
| 15
net/crda/HISTORY
| 4
net/crda/PRE_BUILD
| 9
net/crda/patches/crda-3.18-cflags.patch
| 33
net/crda/patches/crda-3.18-libreg-link.patch
| 30
net/crda/patches/crda-3.18-no-ldconfig.patch
| 28
net/crda/patches/crda-3.18-no-werror.patch
| 32
net/crda/patches/crda-3.18-openssl.patch
| 44
net/iw/DETAILS
| 4
net/iw/HISTORY
| 3
net/wireless-regdb/BUILD
| 1
net/wireless-regdb/DETAILS
| 14
net/wireless-regdb/HISTORY
| 3
net/wireless-regdb/INSTALL
| 2
net/wpa_supplicant/DEPENDS
| 1
net/wpa_supplicant/DETAILS
| 2
net/wpa_supplicant/HISTORY
| 4
python-pypi/m2crypto/DEPENDS
| 1
python-pypi/m2crypto/DETAILS
| 10
python-pypi/m2crypto/HISTORY
| 4
python-pypi/typing/DETAILS
| 4
python-pypi/typing/HISTORY
| 3
qt5/qtbase/HISTORY
| 4

qt5/qtbase/patches/0001-replace-isystem-with-I-to-fix-compilation-error.patch
| 39
shell-term-fm/zsh/DETAILS
| 8
shell-term-fm/zsh/HISTORY
| 3
utils/usbmon/DETAILS
| 8
utils/usbmon/HISTORY
| 3
utils/usbutils/0001-fix-path-to-usb.ids.patch
| 102 +
utils/usbutils/DEPENDS
| 7
utils/usbutils/HISTORY
| 4
utils/usbutils/PRE_BUILD
| 7
utils/youtube-dl/DETAILS
| 2
utils/youtube-dl/HISTORY
| 3
xorg-proto/xcb-proto/DEPENDS
| 1
xorg-proto/xcb-proto/HISTORY
| 3
87 files changed, 577 insertions(+), 1307 deletions(-)

New commits:
commit 496bd2ad8d3f727534b461ce0312288b0747a9a2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/json-for-modern-cpp: new spell, a json library for C++

commit 7be3c0c0797bc355c4406c1df6688d2987fd705b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

editors/vim: version 8.0.1655

commit a79b072d73b11c85f5c4d331e9cbf88368ae0998
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/vala: version 0.40.2

commit 12af2b16cb2ffba501f72882f8e2478c826bdf3c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnome3-libs/pygobject3: version 3.28.2

commit 4d714b19300cd7cfcb2d2725ae28e5960fd4ee87
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-proto/xcb-proto: add dependency on python

commit 52a7d9b86cfc7a152a59c704995b3702e7f0e9f5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

shell-term-fm/zsh: version 5.4.2

commit 2b304aa8779853555c97846dd39cf411b28d0c3b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/youtube-dl: version 2018.03.26.1

commit e63a0c6be3b32d43d0341e0f038280e3f5320022
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/openssl: version 1.0.2o

commit 35fbb7c1ca793e371b64336ed5759efdfa1f08d2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/libraw: version 0.18.8

commit a22a1a65052da4309fd91b8ce83c1d059f820e70
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

http/newsboat: version 2.11

commit 9982a16cfb4b9d84a5a8062e2fb36b8b9ceb9463
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

http/newsbeuter: deprecated in favour of newsboat because of dead upstream

commit b653e5d205196fa9a2b8474757285f4d12e96b0c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

qt5/qtbase: add patch to work around build failure

commit 9e0545cbdd1529da084b01c0e1584276666512fa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/usbmon: version 6.1

commit 10f37ce37d1c8b8541c6b53991d86049eebd2d08
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

disk/eudev: update hardware database in FINAL

commit 8b8e6c841a100b27afa90a04e4506cf4ddf6e9dd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/usbutils: fix path to usb.ids

commit 303c15821ea12337eef8e13d74c337662c61fceb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

net/wpa_supplicant: add dependency on crda

commit ca57e2df41b6aca2e708216cef66670773759bcf
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

net/crda: new spell, tool for managing wifi regulatory settings

commit 8e4fb8fbb670578bf69993f1132e50551499767b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

net/wireless-regdb: new spell, regulatory database for wifi

commit b5d47688d7ae126703d112119cdc244a92a56024
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/typing: version 3.6.4

commit 5f1673170d1440cf14e7d0ff9beb30cb07060c01
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/m2crypto: version 0.29.0

commit b2c6d188073a2dc37bf2631bab8224fd22e83b0a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/darktable: version 2.4.2

commit 425b61f6f816e91fa86fa01d8d3a0edc7e03e87b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

net/iw: version 4.14

commit a4b8a055860e8e558133d5bd2bbbad9bc9f5db5c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

http/firefox-esr: version 52.7.3, security update

commit bb703ec74ab5884e6143bd2ae6e14a743915cb0e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libusb: version 1.0.22

commit 695c88fbfd56645bf6b0090fdf6c1477a9a67b94
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/keepassxc: depend on qttools

commit a6c9eab1b341abb2b07d60185edbfe6ae7f04bde
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/gegl: version 0.3.30

commit 8067e9fa7d2701f4f04ca595b81bf0d85fbad1aa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/icu: stable version 60.2

diff --git a/ChangeLog b/ChangeLog
index 95bbc08..6f702a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/json-for-modern-cpp: new spell, a json library for C++
+
+2018-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * http/newsbeuter: spell deprecated [upstream is officially dead]
+
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * net/wireless-regdb: new spell, regulatory database for wifi
+ * net/crda: new spell, tool for managing wifi regulatory settings
+
2018-03-28 Vlad Glagolev <stealth AT sourcemage.org>
* wm-addons/xdo: small X utility to perform elementary actions on
windows
diff --git a/crypto/keepassxc/DEPENDS b/crypto/keepassxc/DEPENDS
index f782c16..ce7f3c8 100755
--- a/crypto/keepassxc/DEPENDS
+++ b/crypto/keepassxc/DEPENDS
@@ -1,5 +1,6 @@
depends -sub CXX gcc &&
depends qtbase &&
+depends qttools &&
depends cmake &&
depends libgcrypt &&
depends zlib &&
diff --git a/crypto/keepassxc/HISTORY b/crypto/keepassxc/HISTORY
index 8be1a74..3fff33a 100644
--- a/crypto/keepassxc/HISTORY
+++ b/crypto/keepassxc/HISTORY
@@ -1,3 +1,6 @@
+2018-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on qttools
+
2018-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.2.4

diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 1678210..832e79e 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,6 +1,6 @@
SPELL=openssl
- VERSION=1.0.2n
- SECURITY_PATCH=38
+ VERSION=1.0.2o
+ SECURITY_PATCH=39
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE
SOURCE_URL[1]=ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/$SOURCE
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 60fa5b0..dd57f7a 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2018-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.2o, SECURITY_PATCH++
+
2017-12-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.2n, SECURITY_PATCH++

diff --git a/devel/vala/DETAILS b/devel/vala/DETAILS
index 5286849..8aef72e 100755
--- a/devel/vala/DETAILS
+++ b/devel/vala/DETAILS
@@ -3,8 +3,8 @@ if [[ "$VALA_DEVEL" == "y" ]]; then
VERSION=0.35.3

SOURCE_HASH=sha512:8b514713fe5befedba408a99afc29fe2a0d5b51ad796bf32d80a05796fbb2ed945f45722613f9c2d2dae23f27e2e8cecbf62cfb1f02bfa67513d9872647bb1d6
else
- VERSION=0.40.0
-
SOURCE_HASH=sha512:8387935c0fecd3e7f29ea3d6343a72dfb4dc56d2ee2bad1f332e057e1de2ce3aea2889db771acdea8d03cd2df3e0c9a59967b30c7dcf9384704ce6668aa520b8
+ VERSION=0.40.2
+
SOURCE_HASH=sha512:6cd39339d56cf8f0895f20f2d4b738081dbbe350294b61f683f6676402f50d62d6a091b86628887ab0518a283a102113a98eb0e4d63425ebbf5f3d3a36fe835a
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index 6b1885c..e8ff5be 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2018-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable version 0.40.2
+
2018-03-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable version 0.40.0

diff --git a/disk/eudev/DETAILS b/disk/eudev/DETAILS
index 25da00b..d6a97da 100755
--- a/disk/eudev/DETAILS
+++ b/disk/eudev/DETAILS
@@ -1,5 +1,6 @@
SPELL=eudev
VERSION=3.2.5
+ PATCHLEVEL=1

SOURCE_HASH=sha512:f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//v}"
diff --git a/disk/eudev/FINAL b/disk/eudev/FINAL
index 245c952..4ff74ba 100755
--- a/disk/eudev/FINAL
+++ b/disk/eudev/FINAL
@@ -12,6 +12,9 @@ create_group dialout
create_group firewire
create_group tape

+# create hardware database
+udevadm hwdb --update
+
# warn of coming changes
message "\n${PROBLEM_COLOR}About persistent net interfaces naming:" \
"$DEFAULT_COLOR$MESSAGE_COLOR" \
diff --git a/disk/eudev/HISTORY b/disk/eudev/HISTORY
index 283f2db..9cf26b2 100644
--- a/disk/eudev/HISTORY
+++ b/disk/eudev/HISTORY
@@ -1,3 +1,7 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * FINAL: update hardware database
+ * DETAILS: PATCHLEVEL++
+
2018-03-17 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated website

diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 90f8775..7ab0666 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -8,12 +8,12 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=hg_http://vim.googlecode.com/hg:${SPELL}-hg
SOURCE_IGNORE=volatile
else
- VERSION=8.0.1625
+ VERSION=8.0.1655
SECURITY_PATCH=4
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=https://github.com/vim/vim/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:ca6b6b829f33f73540ae47a12a869283dfbc1eaec07d2e9365bd98f94b347030223d4a23a603008dd33d5352a5282d87001af796839367cdbdcea6ee165fe8a9
+
SOURCE_HASH=sha512:ff8ac5afe81ec52299f7603239b615368f5af39ecd2a3128ec7652753900f5b451ca48aa46f20753512b3300943ed719c6feeeb9933c6eec03ae5ff9fdef800b
fi
WEB_SITE=http://www.vim.org
LICENSE[0]=http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index 7064857..edffa46 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2018-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 8.0.1655
+
2018-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 8.0.1625

diff --git a/gnome3-libs/pygobject3/DETAILS b/gnome3-libs/pygobject3/DETAILS
index 1fee86a..7d0bd9b 100755
--- a/gnome3-libs/pygobject3/DETAILS
+++ b/gnome3-libs/pygobject3/DETAILS
@@ -3,8 +3,8 @@ if [[ $PYGOBJECT3_BRANCH == devel ]]; then
VERSION=3.21.0

SOURCE_HASH=sha512:68ce77da051fbc71696bbf271f3693679912e0ba352f1e107b508c0b3eb347498be52745dbf962ed424e133540f77f0f2420948c0fe65d1462fd5797b70650d8
else
- VERSION=3.28.1
-
SOURCE_HASH=sha512:48a21ecf92a8a2302413df048771dd659dd858507dcc0157d4664fa3afcbea13dc6a645369fa76fe0df69ec0897e5a80bf29c3fa1d4425303653879b7ea021ff
+ VERSION=3.28.2
+
SOURCE_HASH=sha512:2ba858856ef7f0c2fcac84a0f0a71ec1212991d8c57613cd948b55d413e69bd0961358935f5fd8753b905753cf563037cb351c428f4afcbbaac8ee0cebf4970c
fi
SOURCE=pygobject-$VERSION.tar.xz
SOURCE_URL[0]=$GNOME_URL/sources/pygobject/${VERSION%.*}/$SOURCE
diff --git a/gnome3-libs/pygobject3/HISTORY b/gnome3-libs/pygobject3/HISTORY
index 074b6e2..86623c0 100644
--- a/gnome3-libs/pygobject3/HISTORY
+++ b/gnome3-libs/pygobject3/HISTORY
@@ -1,3 +1,6 @@
+2018-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable version 3.28.2
+
2018-03-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable version 3.28.1

diff --git a/graphics-libs/gegl/DETAILS b/graphics-libs/gegl/DETAILS
index 33a6e9c..1ee76d2 100755
--- a/graphics-libs/gegl/DETAILS
+++ b/graphics-libs/gegl/DETAILS
@@ -1,7 +1,7 @@
SPELL=gegl
- VERSION=0.3.28
+ VERSION=0.3.30
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:a515108ea4a65fa1ecc60ed18cd288a85877a5b69e573b8c3de04a2c11a3b2b50cdb5897df3f28c84842e6bd553adbd81053502a1ac8ed1d356332a56c58ce1b
+
SOURCE_HASH=sha512:4506eed9980e2a455b43b643d50b3a89d12b605ee4584fc7dd5c63be60acae64eda88f580ecb82891a4b0d69af10730a0d1525de7cc468afccdf2cf78f85b2eb
SOURCE_URL[0]=https://download.gimp.org/pub/$SPELL/${VERSION%.*}/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://gegl.org/
diff --git a/graphics-libs/gegl/HISTORY b/graphics-libs/gegl/HISTORY
index 8cca061..70947f3 100644
--- a/graphics-libs/gegl/HISTORY
+++ b/graphics-libs/gegl/HISTORY
@@ -1,3 +1,6 @@
+2018-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.30
+
2018-01-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.28

diff --git a/graphics-libs/libraw/DETAILS b/graphics-libs/libraw/DETAILS
index 4344362..a409331 100755
--- a/graphics-libs/libraw/DETAILS
+++ b/graphics-libs/libraw/DETAILS
@@ -1,9 +1,9 @@
SPELL=libraw
SPELLX=LibRaw
- VERSION=0.18.5
-
SOURCE_HASH=sha512:751a1c54507b7408d0d36c3f1fb0e31928f5ae540fae42eb2b57d8fcebcd44134dc452a4f3838dd31dbc8fb3978a6cac6129429a3350f8be5dc44146309aff81
-
SOURCE2_HASH=sha512:1599695394717558e61844e32d76bf653741592d81691c9f55bfb72c8c5d485bce4eab3fc0eefd37640254c431bd78706fe04ca547e42566dda789f0b6559af5
-
SOURCE3_HASH=sha512:c00193b64673e093c33a9d1316448eea4eb7e2b274d5d3bd39cef02b7269e56ce72f9b47831039e00b2feb8344b5266f9c03b5f11212d520809674db253cb028
+ VERSION=0.18.8
+
SOURCE_HASH=sha512:48871a5e43c89a17962fae426a962d11a6ce40cb8e7d8abc90e98c899dc42b7e1711398c075901ddbc710fe7e916ba6d507bee7e18975779caa8f5d512b1d580
+
SOURCE2_HASH=sha512:c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
+
SOURCE3_HASH=sha512:10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
SECURITY_PATCH=2
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE2=LibRaw-demosaic-pack-GPL2-$VERSION.tar.gz
diff --git a/graphics-libs/libraw/HISTORY b/graphics-libs/libraw/HISTORY
index 95eb589..0913a75 100644
--- a/graphics-libs/libraw/HISTORY
+++ b/graphics-libs/libraw/HISTORY
@@ -1,3 +1,6 @@
+2018-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.18.8
+
2017-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.18.5
SECURITY_PATCH++ fixes CVE-2017-13735 CVE-2017-14265
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 1cf4117..6005801 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,10 +1,10 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=2.4.1
+ VERSION=2.4.2
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=https://github.com/darktable-org/darktable/releases/download/release-${VERSION}/${SOURCE}
-
SOURCE_HASH=sha256:6254c63f9b50894b3fbf431d98c0fe8ec481957ab91f9af76e33cc1201c29704:UPSTREAM_HASH
+
SOURCE_HASH=sha256:19cccb60711ed0607ceaa844967b692a3b8666b12bf1d12f2242ec8942fa5a81:UPSTREAM_HASH
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
VERSION=$(get_scm_version)
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 2ed079d..8c06b4b 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,6 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.4.2
+
2018-01-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.4.1

diff --git a/http/firefox-esr/DETAILS b/http/firefox-esr/DETAILS
index b05bcf5..b18876d 100755
--- a/http/firefox-esr/DETAILS
+++ b/http/firefox-esr/DETAILS
@@ -1,11 +1,11 @@
SPELL=firefox-esr
SPELLX=firefox
- VERSION=52.7.2esr
+ VERSION=52.7.3esr
SOURCE=$SPELLX-$VERSION.source.tar.xz
-
SOURCE_HASH=sha512:e275fd10fd32a0dc237135af3395e3a1ae501844632c973ff3b9bca1456702ee36dbee99fc57300598403c924c0db63bd62a199845c8f4a2e29db5d1e5973395
+
SOURCE_HASH=sha512:fc5530d8ff5b7f6cd8d9f677d65dee3c1489401c9c9b88258f2e59c7796975cfb7f0b8ccfdf80ae92a6644f51f70de8733c334e4673cad9b8813cca33ae3e1c3

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELLX}/releases/${VERSION}/source/${SOURCE}

SOURCE_URL[1]=http://ftp.mozilla.org/pub/mozilla.org/${SPELLX}/releases/${VERSION}/source/${SOURCE}
- SECURITY_PATCH=105
+ SECURITY_PATCH=106
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index 90fcf6a..700f6e7 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,3 +1,6 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 52.7.3esr, SECURITY_PATCH++
+
2018-03-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 52.7.2esr, SECURITY_PATCH++

diff --git a/http/newsbeuter/0001-compability-fix-for-ncurses-6.patch
b/http/newsbeuter/0001-compability-fix-for-ncurses-6.patch
deleted file mode 100644
index 1f77a32..0000000
--- a/http/newsbeuter/0001-compability-fix-for-ncurses-6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2fca6f12aebcae5e7645ed3ac2e741cd96072c95 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Mon, 21 Aug 2017 20:35:25 +0200
-Subject: [PATCH] compability fix for ncurses 6
-
----
- config.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.sh b/config.sh
-index a9f0081..b97a83f 100755
---- a/config.sh
-+++ b/config.sh
-@@ -110,7 +110,7 @@ check_pkg "stfl" || fail "stfl"
- if [ `uname -s` = "Darwin" ]; then
- check_custom "ncurses5.4" "ncurses5.4-config" || fail "ncurses5.4"
- elif [ `uname -s` != "OpenBSD" ]; then
-- check_custom "ncursesw5" "ncursesw5-config" || fail "ncursesw"
-+ check_custom "ncursesw6" "ncursesw6-config" || fail "ncursesw"
- fi
- check_ssl_implementation
- all_aboard_the_fail_boat
---
-2.14.1
-
diff --git a/http/newsbeuter/BUILD b/http/newsbeuter/BUILD
index b0fa766..27ba77d 100755
--- a/http/newsbeuter/BUILD
+++ b/http/newsbeuter/BUILD
@@ -1 +1 @@
-make prefix=$INSTALL_ROOT/usr
+true
diff --git a/http/newsbeuter/DEPENDS b/http/newsbeuter/DEPENDS
index d6d0064..70845dc 100755
--- a/http/newsbeuter/DEPENDS
+++ b/http/newsbeuter/DEPENDS
@@ -1,14 +1 @@
-if [[ $NEWSBEUTER_BRANCH == scm ]]; then
- depends git
-fi &&
-
-depends sqlite &&
-depends curl &&
-depends gettext &&
-depends pkgconfig &&
-depends libxml2 &&
-depends -sub CXX gcc &&
-depends stfl &&
-depends ncurses &&
-depends openssl &&
-depends json-c
+depends newsboat
diff --git a/http/newsbeuter/DETAILS b/http/newsbeuter/DETAILS
index 0257db7..ce9c182 100755
--- a/http/newsbeuter/DETAILS
+++ b/http/newsbeuter/DETAILS
@@ -1,28 +1,7 @@
- SPELL=newsbeuter
-if [[ $NEWSBEUTER_BRANCH == scm ]]; then
- VERSION=$(get_scm_version)
- SOURCE=$SPELL-git.tar.bz2
-
SOURCE_URL[0]=git_http://github.com/akrennmair/newsbeuter.git:newsbeuter-git
- SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
- FORCE_DOWNLOAD=1
-else
- VERSION=2.9
-
SOURCE_HASH=sha512:b173008c8c8d3729f8ccef3ce62645a05c1803fb842d5c0afdf9ffd4ed3726030f9c359c20bc817402a6a0ea12af742d0ae7faf9b92d52c11f420f62b430b0aa
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://www.${SPELL}.org/downloads/${SOURCE}
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-fi
- SECURITY_PATCH=1
- WEB_SITE="http://www.newsbeuter.org/";
- LICENSE[0]="MIT/X"
- ENTERED=20090629
- KEYWORDS="Office/Business, News/Diary"
- SHORT="An RSS feed reader for text terminals."
-cat << EOF
-Newsbeuter is an RSS feed reader designed to be
-used on text terminals on Unix and Unix-like
-systems. It was developed with texttools users in
-mind, and thus its interface is similar to tools
-like mutt and slrn.
-EOF
+ SPELL=newsbeuter
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by newsboat]
+ EOF
diff --git a/http/newsbeuter/DOWNLOAD b/http/newsbeuter/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/http/newsbeuter/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/http/newsbeuter/HISTORY b/http/newsbeuter/HISTORY
index 399c382..23bca7b 100644
--- a/http/newsbeuter/HISTORY
+++ b/http/newsbeuter/HISTORY
@@ -1,3 +1,8 @@
+2018-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated [upstream is officially dead]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2017-08-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PREPARE, PRE_BUILD, DEPENDS, DETAILS: add option to build from git

diff --git a/http/newsbeuter/INSTALL b/http/newsbeuter/INSTALL
index 51bdf9f..27ba77d 100755
--- a/http/newsbeuter/INSTALL
+++ b/http/newsbeuter/INSTALL
@@ -1 +1 @@
-make prefix=$INSTALL_ROOT/usr install
+true
diff --git a/http/newsbeuter/PRE_BUILD b/http/newsbeuter/PRE_BUILD
index a06be20..27ba77d 100755
--- a/http/newsbeuter/PRE_BUILD
+++ b/http/newsbeuter/PRE_BUILD
@@ -1,11 +1 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-if [[ "$NEWSBEUTER_BRANCH" == "stable" ]]; then
- patch -p1 < "${SPELL_DIRECTORY}/escape.patch" &&
- patch -p1 < "${SPELL_DIRECTORY}/0001-compability-fix-for-ncurses-6.patch"
-fi &&
-
-if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
- sedit "s:-std=c++11:-std=c++0x:" Makefile
-fi
+true
diff --git a/http/newsbeuter/TRIGGERS b/http/newsbeuter/TRIGGERS
new file mode 100755
index 0000000..40ab10b
--- /dev/null
+++ b/http/newsbeuter/TRIGGERS
@@ -0,0 +1 @@
+on_cast newsbeuter dispel_self
diff --git a/http/newsbeuter/escape.patch b/http/newsbeuter/escape.patch
deleted file mode 100644
index 6a3fb66..0000000
--- a/http/newsbeuter/escape.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix a RCE vulnerability in the bookmark command
- Newsbeuter didn't properly escape the title and description fields before
- passing them to the bookmarking program which could lead to remote code
- execution using the shells command substitution functionality (e.g. "$()",
``,
- etc)
-
-Origin: upstream,
https://github.com/akrennmair/newsbeuter/commit/96e9506ae9e252c548665152d1b8968297128307
-Last-Update: 2017-08-18
-
---- newsbeuter-2.9.orig/src/controller.cpp
-+++ newsbeuter-2.9/src/controller.cpp
-@@ -1274,9 +1274,10 @@ std::string controller::bookmark(const s
- std::string bookmark_cmd = cfg.get_configvalue("bookmark-cmd");
- bool is_interactive =
cfg.get_configvalue_as_bool("bookmark-interactive");
- if (bookmark_cmd.length() > 0) {
-- std::string cmdline = utils::strprintf("%s '%s' %s %s",
-+ std::string cmdline = utils::strprintf("%s '%s' '%s' '%s'",
- bookmark_cmd.c_str(),
utils::replace_all(url,"'", "%27").c_str(),
--
stfl::quote(title).c_str(), stfl::quote(description).c_str());
-+
utils::replace_all(title,"'", "%27").c_str(),
-+
utils::replace_all(description,"'", "%27").c_str());
-
- LOG(LOG_DEBUG, "controller::bookmark: cmd = %s",
cmdline.c_str());
diff --git a/http/newsboat/0001-fix-compile-error.patch
b/http/newsboat/0001-fix-compile-error.patch
deleted file mode 100644
index cd74463..0000000
--- a/http/newsboat/0001-fix-compile-error.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 35b45400dcd7656dd2678a8ecea17b93d29c5056 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sun, 21 Jan 2018 01:01:54 +0100
-Subject: [PATCH] fix compile error
-
----
- src/inoreader_api.cpp | 2 +-
- src/oldreader_api.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/inoreader_api.cpp b/src/inoreader_api.cpp
-index d1b0989..64400c9 100644
---- a/src/inoreader_api.cpp
-+++ b/src/inoreader_api.cpp
-@@ -136,7 +136,7 @@ std::vector<tagged_feedurl>
inoreader_api::get_subscribed_urls() {
-
- json_object_object_get_ex(sub, "categories", &node);
- struct array_list * categories = json_object_get_array(node);
-- for (int i = 0; i < array_list_length(categories); i++) {
-+ for (unsigned int i = 0; i < array_list_length(categories);
i++) {
- json_object* cat = json_object_array_get_idx(node, i);
- json_object* label_node {};
- json_object_object_get_ex(cat, "label", &label_node);
-diff --git a/src/oldreader_api.cpp b/src/oldreader_api.cpp
-index 7cdf032..335bec3 100644
---- a/src/oldreader_api.cpp
-+++ b/src/oldreader_api.cpp
-@@ -134,7 +134,7 @@ std::vector<tagged_feedurl>
oldreader_api::get_subscribed_urls() {
-
- json_object_object_get_ex(sub, "categories", &node);
- struct array_list * categories =
json_object_get_array(node);
-- for (int i = 0; i < array_list_length(categories);
i++) {
-+ for (unsigned int i = 0; i <
array_list_length(categories); i++) {
- json_object* cat =
json_object_array_get_idx(node, i);
- json_object* label_node {};
- json_object_object_get_ex(cat, "label",
&label_node);
---
-2.15.1
-
diff --git a/http/newsboat/DEPENDS b/http/newsboat/DEPENDS
index 1a1c3dc..2693bbb 100755
--- a/http/newsboat/DEPENDS
+++ b/http/newsboat/DEPENDS
@@ -1,5 +1,6 @@
. "${GRIMOIRE}/FUNCTIONS" &&

+depends asciidoc &&
depends sqlite &&
depends curl &&
depends gettext &&
@@ -7,7 +8,6 @@ depends pkgconfig &&
depends libxml2 &&
depends -sub CXX gcc &&
depends stfl &&
-depends json-c &&

if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
depends -sub REGEX boost
diff --git a/http/newsboat/DETAILS b/http/newsboat/DETAILS
index 0feea58..3d783be 100755
--- a/http/newsboat/DETAILS
+++ b/http/newsboat/DETAILS
@@ -1,5 +1,5 @@
SPELL=newsboat
- VERSION=2.10.2
+ VERSION=2.11
SOURCE=${SPELL}-${VERSION}.tar.xz
SOURCE2=${SOURCE}.asc
SOURCE_URL[0]=https://newsboat.org/releases/${VERSION}/${SOURCE}
diff --git a/http/newsboat/HISTORY b/http/newsboat/HISTORY
index 6eddb75..a1cccb5 100644
--- a/http/newsboat/HISTORY
+++ b/http/newsboat/HISTORY
@@ -1,3 +1,9 @@
+2018-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 2.11
+ * PRE_BUILD, boost_regex.patch, gcc46.patch,
0001-fix-compile-error.patch:
+ removed, don't apply anymore
+ * DEPENDS: add dependency on asciidoc
+
2018-02-12 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: that patch is compiler-dependent

diff --git a/http/newsboat/PRE_BUILD b/http/newsboat/PRE_BUILD
index 3da324b..bc4ff40 100755
--- a/http/newsboat/PRE_BUILD
+++ b/http/newsboat/PRE_BUILD
@@ -3,9 +3,4 @@ cd "${SOURCE_DIRECTORY}" &&

if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
sedit "s:-std=c++11:-std=c++0x:" Makefile
-
- patch -p0 < "${SPELL_DIRECTORY}/gcc46.patch" &&
- patch -p0 < "${SPELL_DIRECTORY}/boost_regex.patch"
-else
- patch -p1 < "${SPELL_DIRECTORY}/0001-fix-compile-error.patch"
fi
diff --git a/http/newsboat/boost_regex.patch b/http/newsboat/boost_regex.patch
deleted file mode 100644
index 246d127..0000000
--- a/http/newsboat/boost_regex.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/utils.cpp.orig 2017-09-20 15:35:24.000000000 -0400
-+++ src/utils.cpp 2017-09-21 22:02:53.090549692 -0400
-@@ -24,7 +24,7 @@
- #include <cstdarg>
- #include <cstdio>
- #include <algorithm>
--#include <regex>
-+#include <boost/regex.hpp>
-
- #include <curl/curl.h>
-
-@@ -1069,8 +1069,8 @@
- //throw away the query part 'title-with-dashes'
- std::string title = path.substr(0,pos_of_qmrk);
- //Throw away common webpage suffixes: .html, .php, .aspx, .htm
-- std::regex rx("\\.html$|\\.htm$|\\.php$|\\.aspx$");
-- title = std::regex_replace(title,rx,"");
-+ boost::regex rx("\\.html$|\\.htm$|\\.php$|\\.aspx$");
-+ title = boost::regex_replace(title,rx,"");
- // if there is nothing left, just give up
- if (title.empty())
- return title;
diff --git a/http/newsboat/gcc46.patch b/http/newsboat/gcc46.patch
deleted file mode 100644
index 5703bc4..0000000
--- a/http/newsboat/gcc46.patch
+++ /dev/null
@@ -1,930 +0,0 @@
---- src/cache.cpp.orig 2017-09-20 15:35:24.000000000 -0400
-+++ src/cache.cpp 2017-09-22 08:07:07.216014236 -0400
-@@ -206,7 +206,7 @@
- static int guid_callback(void * myguids, int argc, char ** argv, char ** /*
azColName */) {
- auto* guids = static_cast<std::unordered_set<std::string> *>(myguids);
- assert (argc == 1);
-- guids->emplace(argv[0]);
-+ guids->insert(argv[0]);
- return 0;
- }
-
---- src/tagsouppullparser.cpp.orig 2017-09-20 15:35:24.000000000 -0400
-+++ src/tagsouppullparser.cpp 2017-09-22 08:09:36.264588407 -0400
-@@ -504,7 +504,7 @@
- text = tagstr.substr(last_pos, pos - last_pos);
- if (text[text.length()-1] == '/') {
- // a kludge for <br/>
-- text.pop_back();
-+ text.erase(text.size() - 1);
- }
- LOG(level::DEBUG, "parse_tag: tag name = %s", text);
- } else {
---- src/listformatter.cpp.orig 2017-09-20 15:35:24.000000000 -0400
-+++ src/listformatter.cpp 2017-09-22 14:57:54.720041454 -0400
-@@ -46,10 +46,7 @@
- }
-
- if (itempos == UINT_MAX) {
-- lines.insert(
-- lines.cend(),
-- formatted_text.cbegin(),
-- formatted_text.cend());
-+ std::move(formatted_text.cbegin(), formatted_text.cend(),
std::back_inserter(lines));
- } else {
- lines[itempos] = formatted_text[0];
- }
---- include/configparser.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/configparser.h 2017-12-27 08:24:56.790729071 -0500
-@@ -26,11 +26,11 @@
- class configparser : public config_action_handler {
- public:
- configparser();
-- ~configparser() override;
-+ ~configparser();
- void register_handler(const std::string& cmd,
config_action_handler * handler);
- void unregister_handler(const std::string& cmd);
-- void handle_action(const std::string& action, const
std::vector<std::string>& params) override;
-- void dump_config(std::vector<std::string>& ) override {
-+ void handle_action(const std::string& action, const
std::vector<std::string>& params);
-+ void dump_config(std::vector<std::string>& ) {
- /* nothing because configparser itself only handles
include */
- }
- bool parse(const std::string& filename, bool double_include =
true);
-@@ -46,9 +46,9 @@
- class null_config_action_handler : public config_action_handler {
- public:
- null_config_action_handler() { }
-- ~null_config_action_handler() override { }
-- void handle_action(const std::string& , const
std::vector<std::string>& ) override { }
-- void dump_config(std::vector<std::string>& ) override { }
-+ ~null_config_action_handler() { }
-+ void handle_action(const std::string& , const
std::vector<std::string>& ) { }
-+ void dump_config(std::vector<std::string>& ) { }
- };
-
- }
---- include/configcontainer.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/configcontainer.h 2017-12-27 08:27:13.115640760 -0500
-@@ -35,10 +35,10 @@
- class configcontainer : public config_action_handler {
- public:
- configcontainer();
-- ~configcontainer() override;
-+ ~configcontainer();
- void register_commands(configparser& cfgparser);
-- void handle_action(const std::string& action, const
std::vector<std::string>& params) override;
-- void dump_config(std::vector<std::string>& config_output)
override;
-+ void handle_action(const std::string& action, const
std::vector<std::string>& params);
-+ void dump_config(std::vector<std::string>& config_output);
-
- bool get_configvalue_as_bool(const std::string& key);
- int get_configvalue_as_int(const std::string& key);
---- include/colormanager.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/colormanager.h 2017-12-27 08:28:02.012967766 -0500
-@@ -17,10 +17,10 @@
- class colormanager : public config_action_handler {
- public:
- colormanager();
-- ~colormanager() override;
-+ ~colormanager();
- void register_commands(configparser& cfgparser);
-- void handle_action(const std::string& action, const
std::vector<std::string>& params) override;
-- void dump_config(std::vector<std::string>& config_output)
override;
-+ void handle_action(const std::string& action, const
std::vector<std::string>& params);
-+ void dump_config(std::vector<std::string>& config_output);
- bool colors_loaded() {
- return colors_loaded_;
- }
---- include/dialogs_formaction.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/dialogs_formaction.h 2017-12-27 08:30:26.755935752 -0500
-@@ -8,18 +8,18 @@
- class dialogs_formaction : public formaction {
- public:
- dialogs_formaction(view *, std::string formstr);
-- ~dialogs_formaction() override;
-- void prepare() override;
-- void init() override;
-- keymap_hint_entry * get_keymap_hint() override;
-- std::string id() const override {
-+ ~dialogs_formaction();
-+ void prepare();
-+ void init();
-+ keymap_hint_entry * get_keymap_hint();
-+ std::string id() const {
- return "dialogs";
- }
-- std::string title() override;
-- void handle_cmdline(const std::string& cmd) override;
-+ std::string title();
-+ void handle_cmdline(const std::string& cmd);
-
- private:
-- void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr) override;
-+ void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr);
- bool update_list;
- };
-
---- include/exception.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/exception.h 2017-12-27 08:31:07.338207150 -0500
-@@ -8,8 +8,8 @@
- class exception : public std::exception {
- public:
- explicit exception(unsigned int error_code = 0);
-- ~exception() throw() override;
-- const char* what() const throw() override;
-+ ~exception() throw();
-+ const char* what() const throw();
- private:
- unsigned int ecode;
- };
---- include/exceptions.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/exceptions.h 2017-12-27 08:32:20.502696446 -0500
-@@ -12,8 +12,8 @@
- class xmlexception : public std::exception {
- public:
- explicit xmlexception(const std::string& errmsg) :
msg(errmsg) { }
-- ~xmlexception() throw() override { }
-- const char * what() const throw() override {
-+ ~xmlexception() throw() { }
-+ const char * what() const throw() {
- return msg.c_str();
- }
- private:
-@@ -23,8 +23,8 @@
- class configexception : public std::exception {
- public:
- explicit configexception(const std::string& errmsg) :
msg(errmsg) { }
-- ~configexception() throw() override { }
-- const char * what() const throw() override {
-+ ~configexception() throw() { }
-+ const char * what() const throw() {
- return msg.c_str();
- }
- private:
-@@ -35,8 +35,8 @@
- public:
- explicit confighandlerexception(const std::string& emsg) :
msg(emsg) { }
- explicit confighandlerexception(action_handler_status e);
-- ~confighandlerexception() throw() override { }
-- const char * what() const throw() override {
-+ ~confighandlerexception() throw() { }
-+ const char * what() const throw() {
- return msg.c_str();
- }
- int status() {
-@@ -50,8 +50,8 @@
- class dbexception : public std::exception {
- public:
- explicit dbexception(sqlite3 * h) : msg(sqlite3_errmsg(h)) { }
-- ~dbexception() throw() override { }
-- const char * what() const throw() override {
-+ ~dbexception() throw() { }
-+ const char * what() const throw() {
- return msg.c_str();
- }
- private:
-@@ -69,8 +69,8 @@
- : type_(et), addinfo(info), addinfo2(info2)
- { }
-
-- ~matcherexception() throw() override { }
-- const char * what() const throw() override;
-+ ~matcherexception() throw() { }
-+ const char * what() const throw();
- private:
- type type_;
- std::string addinfo;
---- include/feedhq_api.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/feedhq_api.h 2017-12-27 08:33:24.873126930 -0500
-@@ -10,13 +10,13 @@
- class feedhq_api : public remote_api {
- public:
- explicit feedhq_api(configcontainer * c);
-- ~feedhq_api() override;
-- bool authenticate() override;
-- std::vector<tagged_feedurl> get_subscribed_urls() override;
-- void add_custom_headers(curl_slist** custom_headers) override;
-- bool mark_all_read(const std::string& feedurl) override;
-- bool mark_article_read(const std::string& guid, bool read)
override;
-- bool update_article_flags(const std::string& oldflags, const
std::string& newflags, const std::string& guid) override;
-+ ~feedhq_api();
-+ bool authenticate();
-+ std::vector<tagged_feedurl> get_subscribed_urls();
-+ void add_custom_headers(curl_slist** custom_headers);
-+ bool mark_all_read(const std::string& feedurl);
-+ bool mark_article_read(const std::string& guid, bool read);
-+ bool update_article_flags(const std::string& oldflags, const
std::string& newflags, const std::string& guid);
- private:
- std::vector<std::string> get_tags(xmlNode * node);
- std::string get_new_token();
-@@ -32,10 +32,10 @@
- class feedhq_urlreader : public urlreader {
- public:
- feedhq_urlreader(configcontainer * c, const std::string&
url_file, remote_api * a);
-- ~feedhq_urlreader() override;
-- void write_config() override;
-- void reload() override;
-- std::string get_source() override;
-+ ~feedhq_urlreader();
-+ void write_config();
-+ void reload();
-+ std::string get_source();
- private:
- configcontainer * cfg;
- std::string file;
---- include/feedlist_formaction.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/feedlist_formaction.h 2017-12-27 08:34:35.116596692 -0500
-@@ -14,24 +14,24 @@
- class feedlist_formaction : public list_formaction {
- public:
- feedlist_formaction(view *, std::string formstr);
-- ~feedlist_formaction() override;
-- void prepare() override;
-- void init() override;
-+ ~feedlist_formaction();
-+ void prepare();
-+ void init();
- void set_feedlist(std::vector<std::shared_ptr<rss_feed>>&
feeds);
- void
update_visible_feeds(std::vector<std::shared_ptr<rss_feed>>& feeds);
- void set_tags(const std::vector<std::string>& t);
-- keymap_hint_entry * get_keymap_hint() override;
-+ keymap_hint_entry * get_keymap_hint();
- std::shared_ptr<rss_feed> get_feed();
-
-- void set_redraw(bool b) override {
-+ void set_redraw(bool b) {
- formaction::set_redraw(b);
- apply_filter =
!(v->get_cfg()->get_configvalue_as_bool("show-read-feeds"));
- }
-
-- std::string id() const override {
-+ std::string id() const {
- return "feedlist";
- }
-- std::string title() override;
-+ std::string title();
-
- bool jump_to_next_unread_feed(unsigned int& feedpos);
- bool jump_to_previous_unread_feed(unsigned int& feedpos);
-@@ -39,9 +39,9 @@
- bool jump_to_previous_feed(unsigned int& feedpos);
- bool jump_to_random_unread_feed(unsigned int& feedpos);
-
-- void handle_cmdline(const std::string& cmd) override;
-+ void handle_cmdline(const std::string& cmd);
-
-- void finished_qna(operation op) override;
-+ void finished_qna(operation op);
-
- void mark_pos_if_visible(unsigned int pos);
-
-@@ -50,7 +50,7 @@
- private:
-
- int get_pos(unsigned int realidx);
-- void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr) override;
-+ void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr);
-
- void goto_feed(const std::string& str);
-
---- include/filebrowser_formaction.h.orig 2017-12-25 12:49:35.000000000
-0500
-+++ include/filebrowser_formaction.h 2017-12-27 08:38:37.039214577 -0500
-@@ -8,10 +8,10 @@
- class filebrowser_formaction : public formaction {
- public:
- filebrowser_formaction(view *, std::string formstr);
-- ~filebrowser_formaction() override;
-- void prepare() override;
-- void init() override;
-- keymap_hint_entry * get_keymap_hint() override;
-+ ~filebrowser_formaction();
-+ void prepare();
-+ void init();
-+ keymap_hint_entry * get_keymap_hint();
-
- void set_dir(const std::string& d) {
- dir = d;
-@@ -20,13 +20,13 @@
- default_filename = fn;
- }
-
-- std::string id() const override {
-+ std::string id() const {
- return "filebrowser";
- }
-- std::string title() override;
-+ std::string title();
-
- private:
-- void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr) override;
-+ void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr);
-
- std::string add_file(std::string filename);
- std::string get_filename_suggestion(const std::string& s);
---- include/filtercontainer.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/filtercontainer.h 2017-12-27 08:39:27.628552900 -0500
-@@ -10,9 +10,9 @@
- class filtercontainer : public config_action_handler {
- public:
- filtercontainer() { }
-- ~filtercontainer() override;
-- void handle_action(const std::string& action, const
std::vector<std::string>& params) override;
-- void dump_config(std::vector<std::string>& config_output)
override;
-+ ~filtercontainer();
-+ void handle_action(const std::string& action, const
std::vector<std::string>& params);
-+ void dump_config(std::vector<std::string>& config_output);
- std::vector<filter_name_expr_pair>& get_filters() {
- return filters;
- }
---- include/help_formaction.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/help_formaction.h 2017-12-27 08:40:20.533906710 -0500
-@@ -8,19 +8,19 @@
- class help_formaction : public formaction {
- public:
- help_formaction(view *, std::string formstr);
-- ~help_formaction() override;
-- void prepare() override;
-- void init() override;
-- keymap_hint_entry * get_keymap_hint() override;
-- std::string id() const override {
-+ ~help_formaction();
-+ void prepare();
-+ void init();
-+ keymap_hint_entry * get_keymap_hint();
-+ std::string id() const {
- return "help";
- }
-- std::string title() override;
-+ std::string title();
-
-- void finished_qna(operation op) override;
-+ void finished_qna(operation op);
- void set_context(const std::string& ctx);
- private:
-- void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr) override;
-+ void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr);
- std::string make_colorstring(const std::vector<std::string>&
colors);
- bool quit;
- bool apply_search;
---- include/itemlist_formaction.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/itemlist_formaction.h 2017-12-27 08:41:28.185359137 -0500
-@@ -17,11 +17,11 @@
- class itemlist_formaction : public list_formaction {
- public:
- itemlist_formaction(view *, std::string formstr);
-- ~itemlist_formaction() override;
-- void prepare() override;
-- void init() override;
-+ ~itemlist_formaction();
-+ void prepare();
-+ void init();
-
-- void set_redraw(bool b) override {
-+ void set_redraw(bool b) {
- formaction::set_redraw(b);
- apply_filter =
!(v->get_cfg()->get_configvalue_as_bool("show-read-articles"));
- invalidate(InvalidationMode::COMPLETE);
-@@ -29,10 +29,10 @@
-
- void set_feed(std::shared_ptr<rss_feed> fd);
-
-- std::string id() const override {
-+ std::string id() const {
- return "articlelist";
- }
-- std::string title() override;
-+ std::string title();
-
- std::shared_ptr<rss_feed> get_feed() {
- return feed;
-@@ -41,7 +41,7 @@
- pos = p;
- }
- std::string get_guid();
-- keymap_hint_entry * get_keymap_hint() override;
-+ keymap_hint_entry * get_keymap_hint();
-
- bool jump_to_next_unread_item(bool start_with_first);
- bool jump_to_previous_unread_item(bool start_with_last);
-@@ -49,11 +49,11 @@
- bool jump_to_previous_item(bool start_with_last);
- bool jump_to_random_unread_item();
-
-- void handle_cmdline(const std::string& cmd) override;
-+ void handle_cmdline(const std::string& cmd);
-
- void do_update_visible_items();
-
-- void finished_qna(operation op) override;
-+ void finished_qna(operation op);
-
- void set_show_searchresult(bool b) {
- show_searchresult = b;
-@@ -62,12 +62,12 @@
- searchphrase = s;
- }
-
-- void recalculate_form() override;
-+ void recalculate_form();
-
- void set_regexmanager(regexmanager * r);
-
- private:
-- void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr) override;
-+ void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr);
- void set_head(const std::string& s, unsigned int unread,
unsigned int total, const std::string &url);
- int get_pos(unsigned int idx);
-
---- include/itemview_formaction.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/itemview_formaction.h 2017-12-27 08:42:28.853764864 -0500
-@@ -14,9 +14,9 @@
- class itemview_formaction : public formaction {
- public:
- itemview_formaction(view *,
std::shared_ptr<itemlist_formaction> il, std::string formstr);
-- ~itemview_formaction() override;
-- void prepare() override;
-- void init() override;
-+ ~itemview_formaction();
-+ void prepare();
-+ void init();
- void set_guid(const std::string& guid_) {
- guid = guid_;
- }
-@@ -24,15 +24,15 @@
- feed = fd;
- }
- void set_highlightphrase(const std::string& text);
-- keymap_hint_entry * get_keymap_hint() override;
-- void handle_cmdline(const std::string& cmd) override;
-+ keymap_hint_entry * get_keymap_hint();
-+ void handle_cmdline(const std::string& cmd);
-
-- std::string id() const override {
-+ std::string id() const {
- return "article";
- }
-- std::string title() override;
-+ std::string title();
-
-- void finished_qna(operation op) override;
-+ void finished_qna(operation op);
-
- std::vector<std::pair<LineType, std::string>>
- render_html(
-@@ -45,7 +45,7 @@
- void update_percent();
-
- private:
-- void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr) override;
-+ void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr);
- void set_head(const std::string& s, const std::string&
feedtitle, unsigned int unread, unsigned int total);
- void highlight_text(const std::string& searchphrase);
-
---- include/keymap.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/keymap.h 2017-12-27 08:43:20.694111552 -0500
-@@ -155,7 +155,7 @@
- class keymap : public config_action_handler {
- public:
- explicit keymap(unsigned int flags);
-- ~keymap() override;
-+ ~keymap();
- void set_key(operation op, const std::string& key, const
std::string& context);
- void unset_key(const std::string& key, const std::string&
context);
- operation get_opcode(const std::string& opstr);
-@@ -163,8 +163,8 @@
- std::vector<macrocmd> get_macro(const std::string& key);
- char get_key(const std::string& keycode);
- std::string getkey(operation op, const std::string& context);
-- void handle_action(const std::string& action, const
std::vector<std::string>& params) override;
-- void dump_config(std::vector<std::string>& config_output)
override;
-+ void handle_action(const std::string& action, const
std::vector<std::string>& params);
-+ void dump_config(std::vector<std::string>& config_output);
- void get_keymap_descriptions(std::vector<keymap_desc>& descs,
unsigned short flags);
- unsigned short get_flag_from_context(const std::string&
context);
- private:
---- include/newsblur_api.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/newsblur_api.h 2017-12-27 08:44:21.990521479 -0500
-@@ -15,13 +15,13 @@
- class newsblur_api : public remote_api {
- public:
- explicit newsblur_api(configcontainer * c);
-- ~newsblur_api() override;
-- bool authenticate() override;
-- std::vector<tagged_feedurl> get_subscribed_urls() override;
-- void add_custom_headers(curl_slist** custom_headers) override;
-- bool mark_all_read(const std::string& feedurl) override;
-- bool mark_article_read(const std::string& guid, bool read)
override;
-- bool update_article_flags(const std::string& oldflags, const
std::string& newflags, const std::string& guid) override;
-+ ~newsblur_api();
-+ bool authenticate();
-+ std::vector<tagged_feedurl> get_subscribed_urls();
-+ void add_custom_headers(curl_slist** custom_headers);
-+ bool mark_all_read(const std::string& feedurl);
-+ bool mark_article_read(const std::string& guid, bool read);
-+ bool update_article_flags(const std::string& oldflags, const
std::string& newflags, const std::string& guid);
- rsspp::feed fetch_feed(const std::string& id);
- // TODO
- private:
-@@ -37,10 +37,10 @@
- class newsblur_urlreader : public urlreader {
- public:
- newsblur_urlreader(const std::string& url_file, remote_api *
a);
-- ~newsblur_urlreader() override;
-- void write_config() override;
-- void reload() override;
-- std::string get_source() override;
-+ ~newsblur_urlreader();
-+ void write_config();
-+ void reload();
-+ std::string get_source();
- private:
- std::string file;
- remote_api * api;
---- include/ocnews_api.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/ocnews_api.h 2017-12-27 08:45:29.917975752 -0500
-@@ -14,13 +14,13 @@
- class ocnews_api : public remote_api {
- public:
- explicit ocnews_api (configcontainer *cfg);
-- ~ocnews_api() override;
-- bool authenticate() override;
-- std::vector<tagged_feedurl> get_subscribed_urls() override;
-- bool mark_all_read(const std::string& feedurl) override;
-- bool mark_article_read(const std::string& guid, bool read)
override;
-- bool update_article_flags(const std::string& oldflags, const
std::string& newflags, const std::string& guid) override;
-- void add_custom_headers(curl_slist**) override;
-+ ~ocnews_api();
-+ bool authenticate();
-+ std::vector<tagged_feedurl> get_subscribed_urls();
-+ bool mark_all_read(const std::string& feedurl);
-+ bool mark_article_read(const std::string& guid, bool read);
-+ bool update_article_flags(const std::string& oldflags, const
std::string& newflags, const std::string& guid);
-+ void add_custom_headers(curl_slist**);
- rsspp::feed fetch_feed(const std::string& feed_id);
- private:
- typedef std::map<std::string, std::pair<rsspp::feed, long>>
feedmap;
-@@ -35,10 +35,10 @@
- class ocnews_urlreader : public urlreader {
- public:
- ocnews_urlreader(const std::string& url_file, remote_api * a);
-- ~ocnews_urlreader() override;
-- void write_config() override;
-- void reload() override;
-- std::string get_source() override;
-+ ~ocnews_urlreader();
-+ void write_config();
-+ void reload();
-+ std::string get_source();
- private:
- std::string file;
- remote_api * api;
---- include/oldreader_api.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/oldreader_api.h 2017-12-27 08:46:26.127351658 -0500
-@@ -10,13 +10,13 @@
- class oldreader_api : public remote_api {
- public:
- explicit oldreader_api(configcontainer * c);
-- ~oldreader_api() override;
-- bool authenticate() override;
-- std::vector<tagged_feedurl> get_subscribed_urls() override;
-- void add_custom_headers(curl_slist** custom_headers) override;
-- bool mark_all_read(const std::string& feedurl) override;
-- bool mark_article_read(const std::string& guid, bool read)
override;
-- bool update_article_flags(const std::string& oldflags, const
std::string& newflags, const std::string& guid) override;
-+ ~oldreader_api();
-+ bool authenticate();
-+ std::vector<tagged_feedurl> get_subscribed_urls();
-+ void add_custom_headers(curl_slist** custom_headers);
-+ bool mark_all_read(const std::string& feedurl);
-+ bool mark_article_read(const std::string& guid, bool read);
-+ bool update_article_flags(const std::string& oldflags, const
std::string& newflags, const std::string& guid);
- private:
- std::vector<std::string> get_tags(xmlNode * node);
- std::string get_new_token();
-@@ -32,10 +32,10 @@
- class oldreader_urlreader : public urlreader {
- public:
- oldreader_urlreader(configcontainer * c, const std::string&
url_file, remote_api * a);
-- ~oldreader_urlreader() override;
-- void write_config() override;
-- void reload() override;
-- std::string get_source() override;
-+ ~oldreader_urlreader();
-+ void write_config();
-+ void reload();
-+ std::string get_source();
- private:
- configcontainer * cfg;
- std::string file;
---- include/regexmanager.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/regexmanager.h 2017-12-27 08:47:17.156692923 -0500
-@@ -14,9 +14,9 @@
- class regexmanager : public config_action_handler {
- public:
- regexmanager();
-- ~regexmanager() override;
-- void handle_action(const std::string& action, const
std::vector<std::string>& params) override;
-- void dump_config(std::vector<std::string>& config_output)
override;
-+ ~regexmanager();
-+ void handle_action(const std::string& action, const
std::vector<std::string>& params);
-+ void dump_config(std::vector<std::string>& config_output);
- void quote_and_highlight(std::string& str, const std::string&
location);
- void remove_last_regex(const std::string& location);
- int article_matches(matchable * item);
---- include/rss.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/rss.h 2017-12-27 08:48:43.292268965 -0500
-@@ -24,7 +24,7 @@
- class rss_item : public matchable {
- public:
- explicit rss_item(cache * c);
-- ~rss_item() override;
-+ ~rss_item();
-
- std::string title() const;
- std::string title_raw() const {
-@@ -116,8 +116,8 @@
- void update_flags();
- void sort_flags();
-
-- bool has_attribute(const std::string& attribname) override;
-- std::string get_attribute(const std::string& attribname)
override;
-+ bool has_attribute(const std::string& attribname);
-+ std::string get_attribute(const std::string& attribname);
-
- void set_feedptr(std::shared_ptr<rss_feed> ptr);
- std::shared_ptr<rss_feed> get_feedptr() {
-@@ -183,7 +183,7 @@
- public:
- explicit rss_feed(cache * c);
- rss_feed();
-- ~rss_feed() override;
-+ ~rss_feed();
- std::string title_raw() const {
- return title_;
- }
-@@ -270,8 +270,8 @@
- std::string get_tags();
- std::string get_firsttag();
-
-- bool has_attribute(const std::string& attribname) override;
-- std::string get_attribute(const std::string& attribname)
override;
-+ bool has_attribute(const std::string& attribname);
-+ std::string get_attribute(const std::string& attribname);
-
- void update_items(std::vector<std::shared_ptr<rss_feed>>
feeds);
-
-@@ -353,9 +353,9 @@
- class rss_ignores : public config_action_handler {
- public:
- rss_ignores() { }
-- ~rss_ignores() override;
-- void handle_action(const std::string& action, const
std::vector<std::string>& params) override;
-- void dump_config(std::vector<std::string>& config_output)
override;
-+ ~rss_ignores();
-+ void handle_action(const std::string& action, const
std::vector<std::string>& params);
-+ void dump_config(std::vector<std::string>& config_output);
- bool matches(rss_item * item);
- bool matches_lastmodified(const std::string& url);
- bool matches_resetunread(const std::string& url);
---- include/select_formaction.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/select_formaction.h 2017-12-27 08:49:32.838600312 -0500
-@@ -11,10 +11,10 @@
- enum class selection_type { TAG, FILTER };
-
- select_formaction(view *, std::string formstr);
-- ~select_formaction() override;
-- void prepare() override;
-- void init() override;
-- keymap_hint_entry * get_keymap_hint() override;
-+ ~select_formaction();
-+ void prepare();
-+ void init();
-+ keymap_hint_entry * get_keymap_hint();
- std::string get_selected_value() {
- return value;
- }
-@@ -27,13 +27,13 @@
- void set_type(selection_type t) {
- type = t;
- }
-- void handle_cmdline(const std::string& cmd) override;
-- std::string id() const override {
-+ void handle_cmdline(const std::string& cmd);
-+ std::string id() const {
- return (type == selection_type::TAG) ? "tagselection"
: "filterselection";
- }
-- std::string title() override;
-+ std::string title();
- private:
-- void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr) override;
-+ void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr);
- bool quit;
- selection_type type;
- std::string value;
---- include/ttrss_api.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/ttrss_api.h 2017-12-27 08:50:25.925955339 -0500
-@@ -11,15 +11,15 @@
- class ttrss_api : public remote_api {
- public:
- explicit ttrss_api(configcontainer * c);
-- ~ttrss_api() override;
-- bool authenticate() override;
-+ ~ttrss_api();
-+ bool authenticate();
- virtual struct json_object * run_op(const std::string& op,
const std::map<std::string, std::string>& args,
- bool try_login = true);
-- std::vector<tagged_feedurl> get_subscribed_urls() override;
-- void add_custom_headers(curl_slist** custom_headers) override;
-- bool mark_all_read(const std::string& feedurl) override;
-- bool mark_article_read(const std::string& guid, bool read)
override;
-- bool update_article_flags(const std::string& oldflags, const
std::string& newflags, const std::string& guid) override;
-+ std::vector<tagged_feedurl> get_subscribed_urls();
-+ void add_custom_headers(curl_slist** custom_headers);
-+ bool mark_all_read(const std::string& feedurl);
-+ bool mark_article_read(const std::string& guid, bool read);
-+ bool update_article_flags(const std::string& oldflags, const
std::string& newflags, const std::string& guid);
- rsspp::feed fetch_feed(const std::string& id);
- bool update_article(const std::string& guid, int mode, int
field);
- private:
-@@ -37,10 +37,10 @@
- class ttrss_urlreader : public urlreader {
- public:
- ttrss_urlreader(const std::string& url_file, remote_api * a);
-- ~ttrss_urlreader() override;
-- void write_config() override;
-- void reload() override;
-- std::string get_source() override;
-+ ~ttrss_urlreader();
-+ void write_config();
-+ void reload();
-+ std::string get_source();
- private:
- std::string file;
- remote_api * api;
---- include/urlreader.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/urlreader.h 2017-12-27 08:51:18.249305258 -0500
-@@ -31,11 +31,11 @@
- class file_urlreader : public urlreader {
- public:
- explicit file_urlreader(const std::string& file = "");
-- ~file_urlreader() override;
-- void write_config() override;
-- void reload() override;
-+ ~file_urlreader();
-+ void write_config();
-+ void reload();
- void load_config(const std::string& file);
-- std::string get_source() override;
-+ std::string get_source();
- private:
- std::string filename;
- };
-@@ -43,10 +43,10 @@
- class opml_urlreader : public urlreader {
- public:
- explicit opml_urlreader(configcontainer * c);
-- ~opml_urlreader() override;
-- void write_config() override;
-- void reload() override;
-- std::string get_source() override;
-+ ~opml_urlreader();
-+ void write_config();
-+ void reload();
-+ std::string get_source();
- protected:
- virtual void handle_node(xmlNode * node, const std::string&
tag);
- configcontainer * cfg;
---- include/urlview_formaction.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/urlview_formaction.h 2017-12-27 08:52:02.966604310 -0500
-@@ -9,20 +9,20 @@
- class urlview_formaction : public formaction {
- public:
- urlview_formaction(view *, std::shared_ptr<rss_feed>& feed,
std::string formstr);
-- ~urlview_formaction() override;
-- void prepare() override;
-- void init() override;
-- keymap_hint_entry * get_keymap_hint() override;
-+ ~urlview_formaction();
-+ void prepare();
-+ void init();
-+ keymap_hint_entry * get_keymap_hint();
- void set_links(const std::vector<linkpair>& l) {
- links = l;
- }
-- std::string id() const override {
-+ std::string id() const {
- return "urlview";
- }
-- std::string title() override;
-- void handle_cmdline(const std::string& cmd) override;
-+ std::string title();
-+ void handle_cmdline(const std::string& cmd);
- private:
-- void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr) override;
-+ void process_operation(operation op, bool automatic = false,
std::vector<std::string> * args = nullptr);
- std::vector<linkpair> links;
- bool quit;
- std::shared_ptr<rss_feed> feed;
---- include/fslock.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ include/fslock.h 2017-12-27 08:58:09.607056260 -0500
-@@ -14,7 +14,7 @@
- bool try_lock(const std::string& lock_file, pid_t & pid);
-
- private:
-- bool locked = { false };
-+ bool locked;
- std::string lock_filepath;
- };
-
---- src/fslock.cpp.orig 2017-12-25 12:49:35.000000000 -0500
-+++ src/fslock.cpp 2017-12-27 09:38:35.313278451 -0500
-@@ -15,6 +15,11 @@
- LOG(level::DEBUG, "FSLock: removed lockfile %s", lock_filepath);
- }
-
-+FSLock::FSLock()
-+{
-+ locked = { false };
-+}
-+
- FSLock::~FSLock()
- {
- if (locked) {
---- rss/rsspp.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ rss/rsspp.h 2017-12-27 08:59:23.822552585 -0500
-@@ -66,8 +66,8 @@
- class exception : public std::exception {
- public:
- explicit exception(const std::string& errmsg = "");
-- ~exception() throw() override;
-- const char* what() const throw() override;
-+ ~exception() throw();
-+ const char* what() const throw();
- private:
- std::string emsg;
- };
---- rss/rsspp_internal.h.orig 2017-12-25 12:49:35.000000000 -0500
-+++ rss/rsspp_internal.h 2017-12-27 09:00:47.736113767 -0500
-@@ -36,9 +36,9 @@
- };
-
- struct rss_09x_parser : public rss_parser {
-- void parse_feed(feed& f, xmlNode * rootNode) override;
-+ void parse_feed(feed& f, xmlNode * rootNode);
- explicit rss_09x_parser(xmlDocPtr doc) : rss_parser(doc),
ns(nullptr) { }
-- ~rss_09x_parser() override;
-+ ~rss_09x_parser();
- protected:
- const char * ns;
- private:
-@@ -47,21 +47,21 @@
-
- struct rss_20_parser : public rss_09x_parser {
- explicit rss_20_parser(xmlDocPtr doc) : rss_09x_parser(doc) { }
-- void parse_feed(feed& f, xmlNode * rootNode) override;
-- ~rss_20_parser() override { }
-+ void parse_feed(feed& f, xmlNode * rootNode);
-+ ~rss_20_parser() { }
- };
-
- struct rss_10_parser : public rss_parser {
-- void parse_feed(feed& f, xmlNode * rootNode) override;
-+ void parse_feed(feed& f, xmlNode * rootNode);
- explicit rss_10_parser(xmlDocPtr doc) : rss_parser(doc) { }
-- ~rss_10_parser() override { }
-+ ~rss_10_parser() { }
- };
-
-
- struct atom_parser : public rss_parser {
-- void parse_feed(feed& f, xmlNode * rootNode) override;
-+ void parse_feed(feed& f, xmlNode * rootNode);
- explicit atom_parser(xmlDocPtr doc) : rss_parser(doc), ns(0)
{ }
-- ~atom_parser() override { }
-+ ~atom_parser() { }
- private:
- item parse_entry(xmlNode * itemNode);
- const char * ns;
---- src/textformatter.cpp.orig 2017-12-25 12:49:35.000000000 -0500
-+++ src/textformatter.cpp 2017-12-27 09:28:32.097244374 -0500
-@@ -58,7 +58,7 @@
- if (iswhitespace(words[0])) {
- prefix = utils::substr_with_width(words[0], width);
- prefix_width = utils::strwidth_stfl(prefix);
-- words.erase(words.cbegin());
-+ words.erase(words.begin());
- }
-
- std::string curline = prefix;
---- doc/gen-example-config.cpp.orig 2017-12-25 12:49:35.000000000 -0500
-+++ doc/gen-example-config.cpp 2017-12-27 09:48:23.481211892 -0500
-@@ -5,7 +5,7 @@
- std::string to80Columns(std::string input) {
- std::istringstream s(input);
- const std::string prefix = "#";
-- const int limit = 80;
-+ const unsigned int limit = 80;
- std::string result;
- std::string curline = prefix;
-
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index ea6fb00..b8d4235 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -3,15 +3,15 @@ if [[ "$ICU_DEV" == 'y' ]]; then
VERSION=61.1
VX=${VERSION//.r/r}
else
- VERSION=58.2
-
SOURCE_HASH=sha512:5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
+ VERSION=60.2
+
SOURCE_HASH=sha512:8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
fi
VX=$VERSION
SPELLX=icu4c
VERSIONX=${VERSION//./_}
SOURCE=$SPELLX-$VERSIONX-src.tgz
SITE=http://download.icu-project.org/files
- PATCHLEVEL=1
+ SECURITY_PATCH=1

if [[ "$ICU_DOC" == 'y' ]]; then
SOURCE2=$SPELLX-${VERSIONX}-docs.zip
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 78515d3..f7c104d 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -3,6 +3,10 @@
* icu.gpg: replaced old key(s) with D1BA20D7,
Fredrik Roubert <fredrik AT roubert.name>

+2018-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable version 60.2
+ * collation.patch, xlocale.patch, PRE_BUILD: removed
+
2018-01-08 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: You see a signature file for the non-dev version?
I don't. Restored the SOURCE_HASH for version 58.2 .
diff --git a/libs/icu/PRE_BUILD b/libs/icu/PRE_BUILD
deleted file mode 100755
index 2721df2..0000000
--- a/libs/icu/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-if [[ "$ICU_DEV" == 'n' ]]; then
-cd "${SOURCE_DIRECTORY}" &&
-patch -p3 < "$SPELL_DIRECTORY/collation.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/xlocale.patch"
-fi
diff --git a/libs/icu/collation.patch b/libs/icu/collation.patch
deleted file mode 100644
index d2316eb..0000000
--- a/libs/icu/collation.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: /icu/trunk/source/common/ulist.c
-===================================================================
---- /icu/trunk/source/common/ulist.c (revision 39483)
-+++ /icu/trunk/source/common/ulist.c (revision 39484)
-@@ -30,5 +30,4 @@
-
- int32_t size;
-- int32_t currentIndex;
- };
-
-@@ -52,5 +51,4 @@
- newList->tail = NULL;
- newList->size = 0;
-- newList->currentIndex = -1;
-
- return newList;
-@@ -81,6 +79,7 @@
- p->next->previous = p->previous;
- }
-- list->curr = NULL;
-- list->currentIndex = 0;
-+ if (p == list->curr) {
-+ list->curr = p->next;
-+ }
- --list->size;
- if (p->forceDelete) {
-@@ -151,5 +150,4 @@
- list->head->previous = newItem;
- list->head = newItem;
-- list->currentIndex++;
- }
-
-@@ -194,5 +192,4 @@
- curr = list->curr;
- list->curr = curr->next;
-- list->currentIndex++;
-
- return curr->data;
-@@ -210,5 +207,4 @@
- if (list != NULL) {
- list->curr = list->head;
-- list->currentIndex = 0;
- }
- }
-@@ -273,3 +269,2 @@
- return (UList *)(en->context);
- }
--
-Index: /icu/trunk/source/i18n/ucol_res.cpp
-===================================================================
---- /icu/trunk/source/i18n/ucol_res.cpp (revision 39483)
-+++ /icu/trunk/source/i18n/ucol_res.cpp (revision 39484)
-@@ -681,4 +681,5 @@
- }
- memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));
-+ ulist_resetList(sink.values); // Initialize the iterator.
- en->context = sink.values;
- sink.values = NULL; // Avoid deletion in the sink destructor.
-Index: /icu/trunk/source/test/intltest/apicoll.cpp
-===================================================================
---- /icu/trunk/source/test/intltest/apicoll.cpp (revision 39483)
-+++ /icu/trunk/source/test/intltest/apicoll.cpp (revision 39484)
-@@ -82,14 +82,7 @@
- col = Collator::createInstance(Locale::getEnglish(), success);
- if (U_FAILURE(success)){
-- errcheckln(success, "Default Collator creation failed. - %s",
u_errorName(success));
-- return;
-- }
--
-- StringEnumeration* kwEnum = col->getKeywordValuesForLocale("",
Locale::getEnglish(),true,success);
-- if (U_FAILURE(success)){
-- errcheckln(success, "Get Keyword Values for Locale failed. - %s",
u_errorName(success));
-- return;
-- }
-- delete kwEnum;
-+ errcheckln(success, "English Collator creation failed. - %s",
u_errorName(success));
-+ return;
-+ }
-
- col->getVersion(versionArray);
-@@ -230,4 +223,27 @@
- delete aFrCol;
- delete junk;
-+}
-+
-+void CollationAPITest::TestKeywordValues() {
-+ IcuTestErrorCode errorCode(*this, "TestKeywordValues");
-+ LocalPointer<Collator>
col(Collator::createInstance(Locale::getEnglish(), errorCode));
-+ if (errorCode.logIfFailureAndReset("English Collator creation failed"))
{
-+ return;
-+ }
-+
-+ LocalPointer<StringEnumeration> kwEnum(
-+ col->getKeywordValuesForLocale("collation", Locale::getEnglish(),
TRUE, errorCode));
-+ if (errorCode.logIfFailureAndReset("Get Keyword Values for English
Collator failed")) {
-+ return;
-+ }
-+ assertTrue("expect at least one collation tailoring for English",
kwEnum->count(errorCode) > 0);
-+ const char *kw;
-+ UBool hasStandard = FALSE;
-+ while ((kw = kwEnum->next(NULL, errorCode)) != NULL) {
-+ if (strcmp(kw, "standard") == 0) {
-+ hasStandard = TRUE;
-+ }
-+ }
-+ assertTrue("expect at least the 'standard' collation tailoring for
English", hasStandard);
- }
-
-@@ -2467,4 +2483,5 @@
- TESTCASE_AUTO_BEGIN;
- TESTCASE_AUTO(TestProperty);
-+ TESTCASE_AUTO(TestKeywordValues);
- TESTCASE_AUTO(TestOperators);
- TESTCASE_AUTO(TestDuplicate);
-Index: /icu/trunk/source/test/intltest/apicoll.h
-===================================================================
---- /icu/trunk/source/test/intltest/apicoll.h (revision 39483)
-+++ /icu/trunk/source/test/intltest/apicoll.h (revision 39484)
-@@ -36,4 +36,5 @@
- */
- void TestProperty(/* char* par */);
-+ void TestKeywordValues();
-
- /**
diff --git a/libs/icu/xlocale.patch b/libs/icu/xlocale.patch
deleted file mode 100644
index add0d76..0000000
--- a/libs/icu/xlocale.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c4254fd8ff1888ca285e3242b812010357ce2b3e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem AT gmail.com>
-Date: Sat, 24 Jun 2017 22:52:40 -0700
-Subject: [PATCH] i18n: Drop include <xlocale.h>
-
-glibc 2.26 drops this header
-
-Signed-off-by: Khem Raj <raj.khem AT gmail.com>
----
-Upstream-Status: Pending
-
- i18n/digitlst.cpp | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-Index: source/i18n/digitlst.cpp
-===================================================================
---- source.orig/i18n/digitlst.cpp
-+++ source/i18n/digitlst.cpp
-@@ -61,11 +61,7 @@
- #endif
-
- #if U_USE_STRTOD_L
--# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
--# include <locale.h>
--# else
--# include <xlocale.h>
--# endif
-+# include <locale.h>
- #endif
-
- //
***************************************************************************
diff --git a/libs/json-for-modern-cpp/BUILD b/libs/json-for-modern-cpp/BUILD
new file mode 100755
index 0000000..a51a55a
--- /dev/null
+++ b/libs/json-for-modern-cpp/BUILD
@@ -0,0 +1,2 @@
+OPTS="-DJSON_MultipleHeaders=on $OPTS" &&
+cmake_build
diff --git a/libs/json-for-modern-cpp/DETAILS
b/libs/json-for-modern-cpp/DETAILS
new file mode 100755
index 0000000..9aa31d0
--- /dev/null
+++ b/libs/json-for-modern-cpp/DETAILS
@@ -0,0 +1,31 @@
+ SPELL=json-for-modern-cpp
+ VERSION=3.1.2
+ SOURCE="nlohmann-json-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://github.com/nlohmann/json/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:d0a8b968c8fb8cb8f5350f9f3ba78ee26c4b699264f6a52270baaf5c25c0021df1f02b4b0ac99b6e6d46943a92aead613a51f5ebd2155e4f12b74852bbcfd8ef
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/json-${VERSION}"
+ WEB_SITE="https://github.com/nlohmann/json";
+ LICENSE[0]=MIT
+ ENTERED=20180330
+ SHORT="a json library for modern C++"
+cat << EOF
+There are myriads of JSON libraries out there, and each may even have its
+reason to exist. Our class had these design goals:
+
+ * Intuitive syntax. In languages such as Python, JSON feels like a first
+ class data type. We used all the operator magic of modern C++ to achieve
+ the same feeling in your code. Check out the examples below and you'll
+ know what I mean.
+
+ * Trivial integration. Our whole code consists of a single header file
+ json.hpp. That's it. No library, no subproject, no dependencies, no
complex
+ build system. The class is written in vanilla C++11. All in all,
everything
+ should require no adjustment of your compiler flags or project settings.
+
+ * Serious testing. Our class is heavily unit-tested and covers 100% of the
+ code, including all exceptional behavior. Furthermore, we checked with
+ Valgrind and the Clang Sanitizers that there are no memory leaks. Google
+ OSS-Fuzz additionally runs fuzz tests agains all parsers 24/7,
effectively
+ executing billions of tests so far. To maintain high quality, the project
+ is following the Core Infrastructure Initiative (CII) best practices.
+EOF
diff --git a/libs/json-for-modern-cpp/HISTORY
b/libs/json-for-modern-cpp/HISTORY
new file mode 100644
index 0000000..dfe9ae4
--- /dev/null
+++ b/libs/json-for-modern-cpp/HISTORY
@@ -0,0 +1,3 @@
+2018-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS: spell created
+
diff --git a/libs/libusb/DETAILS b/libs/libusb/DETAILS
index e80d9aae..d3718e3 100755
--- a/libs/libusb/DETAILS
+++ b/libs/libusb/DETAILS
@@ -1,6 +1,6 @@
SPELL=libusb
- VERSION=1.0.21
-
SOURCE_HASH=sha512:29899c573f7aa444058d1755e60ccc818903ae7436710a9f3f3db04f1d456634c55f8b90cb325b443f70dfe84271194be8f4535440b885c5bdfffe8c1e8b46f2
+ VERSION=1.0.22
+
SOURCE_HASH=sha512:b1fed66aafa82490889ee488832c6884a95d38ce7b28fb7c3234b9bce1f749455d7b91cde397a0abc25101410edb13ab2f9832c59aa7b0ea8c19ba2cf4c63b00
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://github.com/libusb/libusb/archive/v${VERSION}.tar.gz
diff --git a/libs/libusb/HISTORY b/libs/libusb/HISTORY
index 04b1d66..7a294fb 100644
--- a/libs/libusb/HISTORY
+++ b/libs/libusb/HISTORY
@@ -1,3 +1,6 @@
+2018-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.22
+
2017-05-23 Treeve Jelbert <treeve AT sourcemage.org>
* UP_TRIGGERS: do not force cast of libusb-compat

diff --git a/net/crda/BUILD b/net/crda/BUILD
new file mode 100755
index 0000000..d0fd00d
--- /dev/null
+++ b/net/crda/BUILD
@@ -0,0 +1,9 @@
+PREFIX="${INSTALL_ROOT}/usr" \
+SBINDIR='$(PREFIX)/sbin/' \
+LIBDIR='$(PREFIX)/'"/usr/lib" \
+UDEV_RULE_DIR="${INSTALL_ROOT}/etc/udev/rules.d" \
+REG_BIN="${INSTALL_ROOT}"/usr/lib/crda/regulatory.bin \
+V=1 \
+WERROR= \
+default_build_make
+
diff --git a/net/crda/DEPENDS b/net/crda/DEPENDS
new file mode 100755
index 0000000..9a358cf
--- /dev/null
+++ b/net/crda/DEPENDS
@@ -0,0 +1,5 @@
+depends python &&
+depends m2crypto &&
+depends wireless-regdb &&
+depends SSL &&
+depends libnl
diff --git a/net/crda/DETAILS b/net/crda/DETAILS
new file mode 100755
index 0000000..235d4d3
--- /dev/null
+++ b/net/crda/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=crda
+ VERSION=3.18
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
+ SOURCE_URL[0]=http://kernel.org/pub/software/network/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/";
+ LICENSE[0]=copyleft-next 0.3.0
+ ENTERED=20180328
+ SHORT="a udev helper for communication between the kernel and
userspace for regulatory compliance"
+cat << EOF
+CRDA acts as the udev helper for communication between the kernel and
userspace
+for regulatory compliance. It relies on nl80211 for communication. CRDA is
+intended to be run only through udev communication from the kernel.
+EOF
diff --git a/net/crda/HISTORY b/net/crda/HISTORY
new file mode 100644
index 0000000..4617990
--- /dev/null
+++ b/net/crda/HISTORY
@@ -0,0 +1,4 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS, patches/*, BUILD, PRE_BUILD: spell created
+ * patches/*: patches adapted from gentoo to make crda compile
+
diff --git a/net/crda/PRE_BUILD b/net/crda/PRE_BUILD
new file mode 100755
index 0000000..0a365b5
--- /dev/null
+++ b/net/crda/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "${SPELL_DIRECTORY}"/patches/${SPELL}-3.18-no-ldconfig.patch &&
+patch -p1 < "${SPELL_DIRECTORY}"/patches/${SPELL}-3.18-no-werror.patch &&
+patch -p1 < "${SPELL_DIRECTORY}"/patches/${SPELL}-3.18-openssl.patch &&
+patch -p1 < "${SPELL_DIRECTORY}"/patches/${SPELL}-3.18-cflags.patch &&
+patch -p1 < "${SPELL_DIRECTORY}"/patches/${SPELL}-3.18-libreg-link.patch
+
diff --git a/net/crda/patches/crda-3.18-cflags.patch
b/net/crda/patches/crda-3.18-cflags.patch
new file mode 100644
index 0000000..a875b48
--- /dev/null
+++ b/net/crda/patches/crda-3.18-cflags.patch
@@ -0,0 +1,33 @@
+From c5b0741ea7fc12e9f6a2a309296ed412a999d0f7 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT chromium.org>
+Date: Wed, 4 Mar 2015 14:09:50 -0500
+Subject: [PATCH] clean up CFLAGS handling
+
+Rather than append -O2 -g all the time to the user's CFLAGS (and thus
+clobbering whatever they have set up), initialize the default value to
+that and let the user override it entirely.
+
+Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5f988f4..8e345a1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -26,9 +26,9 @@ PUBKEY_DIR?=pubkeys
+ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+
+ WERROR = -Werror
+-CFLAGS += -O2 -fpic
++CFLAGS ?= -O2 -g
++CFLAGS += -fpic
+ CFLAGS += -std=gnu99 -Wall -Wno-error -pedantic
+-CFLAGS += -Wall -g
+ LDLIBREG += -lreg
+ LDLIBS += $(LDLIBREG)
+ LDLIBS += -lm
+--
+2.3.1
+
diff --git a/net/crda/patches/crda-3.18-libreg-link.patch
b/net/crda/patches/crda-3.18-libreg-link.patch
new file mode 100644
index 0000000..0aa1b6e
--- /dev/null
+++ b/net/crda/patches/crda-3.18-libreg-link.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/542436
+
+From f56ab87b25f2228a67ac592a1c18793c72dd03eb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT gentoo.org>
+Date: Sat, 7 Mar 2015 22:29:33 -0500
+Subject: [PATCH crda] libreg: link against crypto libs
+
+Since libreg uses funcs from the crypto lib, make sure we link them.
+
+Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 8e345a1..77708e6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -117,7 +117,7 @@ keys-%.c: utils/key2pub.py $(wildcard
$(PUBKEY_DIR)/*.pem)
+
+ $(LIBREG): regdb.h reglib.h reglib.c
+ $(NQ) ' CC ' $@
+- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG)
$^ $(filter-out -lreg,$(LDLIBS))
+
+ install-libreg-headers:
+ $(NQ) ' INSTALL libreg-headers'
+--
+2.3.1
+
diff --git a/net/crda/patches/crda-3.18-no-ldconfig.patch
b/net/crda/patches/crda-3.18-no-ldconfig.patch
new file mode 100644
index 0000000..a5cc420
--- /dev/null
+++ b/net/crda/patches/crda-3.18-no-ldconfig.patch
@@ -0,0 +1,28 @@
+From b11d83df189670defe4a29c624f2930351c13df2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT gentoo.org>
+Date: Wed, 4 Mar 2015 13:56:36 -0500
+Subject: [PATCH] do not run ldconfig
+
+Let the distro/user deal with ldconfig updating. Running it blindly like
+this breaks DESTDIR installs as `ldconfig` only operates on system paths.
+
+Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index a3ead30..46c683d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -127,7 +127,6 @@ install-libreg:
+ $(NQ) ' INSTALL libreg'
+ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
+ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
+- $(Q)ldconfig
+
+ %.o: %.c regdb.h $(LIBREG)
+ $(NQ) ' CC ' $@
+--
+2.3.1
+
diff --git a/net/crda/patches/crda-3.18-no-werror.patch
b/net/crda/patches/crda-3.18-no-werror.patch
new file mode 100644
index 0000000..d23a9c9
--- /dev/null
+++ b/net/crda/patches/crda-3.18-no-werror.patch
@@ -0,0 +1,32 @@
+From 37384d22ba0ab622a5848a9a794084e6064fc905 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT chromium.org>
+Date: Wed, 4 Mar 2015 14:03:44 -0500
+Subject: [PATCH] allow people to turn off -Werror
+
+Forcing -Werror at build time easily breaks across compiler settings,
+compiler versions, architectures, C libraries, etc... Add a knob so
+distro peeps can turn it off.
+
+Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
+---
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 46c683d..5f988f4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -25,8 +25,9 @@ UDEV_RULE_DIR?=/lib/udev/rules.d/
+ PUBKEY_DIR?=pubkeys
+ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+
++WERROR = -Werror
+ CFLAGS += -O2 -fpic
+-CFLAGS += -std=gnu99 -Wall -Werror -pedantic
++CFLAGS += -std=gnu99 -Wall -Wno-error -pedantic
+ CFLAGS += -Wall -g
+ LDLIBREG += -lreg
+ LDLIBS += $(LDLIBREG)
+--
+2.3.1
+
diff --git a/net/crda/patches/crda-3.18-openssl.patch
b/net/crda/patches/crda-3.18-openssl.patch
new file mode 100644
index 0000000..9147e86
--- /dev/null
+++ b/net/crda/patches/crda-3.18-openssl.patch
@@ -0,0 +1,44 @@
+From af009b7599d705a1023d7bc95c485e5a8776d2b8 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT chromium.org>
+Date: Wed, 4 Mar 2015 14:07:37 -0500
+Subject: [PATCH] fix openssl generation
+
+This file uses BN_ULONG but doesn't include the openssl headers leading
+to build failures:
+keys-ssl.c:2:8: error: unknown type name 'BN_ULONG'
+ static BN_ULONG e_0[1] = {
+
+The large unqualified constants also break building:
+keys-ssl.c:8:2: warning: overflow in implicit constant conversion
[-Woverflow]
+ 0x63a2705416a0d8e1, 0xdc9fca11c8ba757b,
+ ^
+
+Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
+---
+ utils/key2pub.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/utils/key2pub.py b/utils/key2pub.py
+index 3e84cd2..c504aca 100755
+--- a/utils/key2pub.py
++++ b/utils/key2pub.py
+@@ -24,7 +24,7 @@ def print_ssl_64(output, name, val):
+ for v1, v2, v3, v4, v5, v6, v7, v8 in vnew:
+ if not idx:
+ output.write('\t')
+- output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1),
ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
++ output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1),
ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
+ idx += 1
+ if idx == 2:
+ idx = 0
+@@ -60,6 +60,7 @@ def print_ssl_32(output, name, val):
+ def print_ssl(output, name, val):
+ import struct
+ output.write('#include <stdint.h>\n')
++ output.write('#include <openssl/bn.h>\n')
+ if len(struct.pack('@L', 0)) == 8:
+ return print_ssl_64(output, name, val)
+ else:
+--
+2.3.1
+
diff --git a/net/iw/DETAILS b/net/iw/DETAILS
index 8306192..639f398 100755
--- a/net/iw/DETAILS
+++ b/net/iw/DETAILS
@@ -1,6 +1,6 @@
SPELL=iw
- VERSION=4.9
-
SOURCE_HASH=sha512:3c99d8fc07d6d85b8304ff34b96573e22af65aea688a8cb08051ce4857d7ce9ac32a5acd3b30157c6c78e942f84a18f9229c17e353b7a6d01c80324729af18b3
+ VERSION=4.14
+
SOURCE_HASH=sha512:1ce6335628641eb14ed71d39b96a9907fe36e597e6413fdce7f98f7007939bbdc3fac5af69eb1c857259706937e1a7495cf8cbd4e4ba8528c2a471ef6e4bf809
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://linuxwireless.org/en/users/Documentation/iw
diff --git a/net/iw/HISTORY b/net/iw/HISTORY
index 98676bf..24b0181 100644
--- a/net/iw/HISTORY
+++ b/net/iw/HISTORY
@@ -1,3 +1,6 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.14
+
2017-02-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.9

diff --git a/net/wireless-regdb/BUILD b/net/wireless-regdb/BUILD
new file mode 100755
index 0000000..446962d
--- /dev/null
+++ b/net/wireless-regdb/BUILD
@@ -0,0 +1 @@
+gzip -9 regulatory.bin.5
diff --git a/net/wireless-regdb/DETAILS b/net/wireless-regdb/DETAILS
new file mode 100755
index 0000000..68109a8
--- /dev/null
+++ b/net/wireless-regdb/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=wireless-regdb
+ VERSION=2017-12-23
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/snapshot/wireless-regdb-master-${VERSION}.tar.gz
+
SOURCE_HASH=sha512:b5bc3d9e0c712483e8df116e99ed3ed173cd6673082924fb5e7bbe19ace5b01c8b9d6a3f39bc24e2e611ef7ebd65c67c20c87cd0e82f104d89b9d0e2010d4589
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-master-${VERSION}"
+
WEB_SITE="https://wireless.wiki.kernel.org/en/developers/Regulatory/wireless-regdb";
+ LICENSE[0]=ISC
+ ENTERED=20180328
+ SHORT="a regulatory database for crda"
+cat << EOF
+A regulatory database for crda. It contains information about the conditions
+of use of wifi channels in different countries.
+EOF
diff --git a/net/wireless-regdb/HISTORY b/net/wireless-regdb/HISTORY
new file mode 100644
index 0000000..e27d4d2
--- /dev/null
+++ b/net/wireless-regdb/HISTORY
@@ -0,0 +1,3 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: spell created
+
diff --git a/net/wireless-regdb/INSTALL b/net/wireless-regdb/INSTALL
new file mode 100755
index 0000000..4804e12
--- /dev/null
+++ b/net/wireless-regdb/INSTALL
@@ -0,0 +1,2 @@
+install -D -m644 -o root -g root "${SOURCE_DIRECTORY}/regulatory.bin"
"${INSTALL_ROOT}/usr/lib/crda/regulatory.bin" &&
+install -D -m644 -o root -g root "${SOURCE_DIRECTORY}/regulatory.bin.5.gz"
"${INSTALL_ROOT}/usr/share/man/man5/regulatory.bin.5.gz"
diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index b3b524a..76903e2 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -1,5 +1,6 @@
depends -sub CXX gcc &&
depends wireless_tools &&
+depends crda &&

if [ "$CONFIG_DRIVER_NL80211" = y ]; then
depends libnl
diff --git a/net/wpa_supplicant/DETAILS b/net/wpa_supplicant/DETAILS
index 94ff70e..1322fb9 100755
--- a/net/wpa_supplicant/DETAILS
+++ b/net/wpa_supplicant/DETAILS
@@ -13,7 +13,7 @@ else
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_HASH=sha512:46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6
fi
- PATCHLEVEL=3
+ PATCHLEVEL=4
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://w1.fi/releases/$SOURCE
LICENSE[0]=GPL
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 0fe9558..786f6f7 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,7 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on crda
+ * DETAILS: PATCHLEVEL++
+
2017-10-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.6; SECURITY_PATCH++
* BUILD: correct BINDIR
diff --git a/python-pypi/m2crypto/DEPENDS b/python-pypi/m2crypto/DEPENDS
index bc62d48..987fc67 100755
--- a/python-pypi/m2crypto/DEPENDS
+++ b/python-pypi/m2crypto/DEPENDS
@@ -1,3 +1,4 @@
depends python &&
+depends typing &&
depends SSL &&
depends swig
diff --git a/python-pypi/m2crypto/DETAILS b/python-pypi/m2crypto/DETAILS
index 98fd00c..56eacc8 100755
--- a/python-pypi/m2crypto/DETAILS
+++ b/python-pypi/m2crypto/DETAILS
@@ -1,10 +1,10 @@
SPELL=m2crypto
- VERSION=0.18.2
+ VERSION=0.29.0
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://chandlerproject.org/pub/Projects/MeTooCrypto/$SOURCE
-
SOURCE_HASH=sha512:bc97142df2b6404cc0cc30746f88b62d4d274fc22e1522bff64e90cce5aaf3089cb2388a5a063172dcfbba6f909ecbdaab6539d1fb39832f2ad8dfdb39430dbf
- WEB_SITE=http://chandlerproject.org/Projects/MeTooCrypto
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/M2Crypto-$VERSION
+
SOURCE_URL[0]=https://files.pythonhosted.org/packages/source/M/M2Crypto/M2Crypto-${VERSION}.tar.gz
+
SOURCE_HASH=sha512:4239f7efd42ee059a8b55cfbf63c9db96d546ad04ec2965a415f99e62359810f4f1cb20118261bf7834eab4093d974d494c3995c709148bc6105a3cedb508f3e
+ WEB_SITE=https://gitlab.com/m2crypto/m2crypto
ENTERED=20050118
LICENSE[0]=GPL
SHORT="M2Crypto is a crypto and SSL toolkit for Python"
diff --git a/python-pypi/m2crypto/HISTORY b/python-pypi/m2crypto/HISTORY
index bce0b40..e58d67d 100644
--- a/python-pypi/m2crypto/HISTORY
+++ b/python-pypi/m2crypto/HISTORY
@@ -1,3 +1,7 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0], fix WEB_SITE, version 0.29.0
+ * DEPENDS: depend on typing
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/python-pypi/typing/DETAILS b/python-pypi/typing/DETAILS
index d187d11..0f20d32 100755
--- a/python-pypi/typing/DETAILS
+++ b/python-pypi/typing/DETAILS
@@ -1,8 +1,8 @@
SPELL=typing
- VERSION=3.6.2
+ VERSION=3.6.4
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://pypi.io/packages/source/t/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:a975980e7ba6ec3e15c938336877071785bec7212443da079770348ab9441c8d918cd806e85ebea8af66a5d94f684566ea07b55e7623ab11e7d922c8c3dfe981
+
SOURCE_HASH=sha512:f595e0fc395ba13a129ae45681faca7b199fd5c23e8f1573f49e2a6f162b7f2aef680306e76cbf50b978de9f047c674323219981e89c476474295bb8c02211ce
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=https://docs.python.org/3/library/typing.html
LICENSE[0]=PYTHON
diff --git a/python-pypi/typing/HISTORY b/python-pypi/typing/HISTORY
index eecb074..31760b3 100644
--- a/python-pypi/typing/HISTORY
+++ b/python-pypi/typing/HISTORY
@@ -1,2 +1,5 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.6.4
+
2017-09-18 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS, DETAILS: created spell, version 3.6.2
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 77af489..de51e2e 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,7 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * patches/0001-replace-isystem-with-I-to-fix-compilation-error.patch:
fix
+ compilation error
+
2018-03-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: tweak

diff --git
a/qt5/qtbase/patches/0001-replace-isystem-with-I-to-fix-compilation-error.patch

b/qt5/qtbase/patches/0001-replace-isystem-with-I-to-fix-compilation-error.patch
new file mode 100644
index 0000000..3431489
--- /dev/null
+++
b/qt5/qtbase/patches/0001-replace-isystem-with-I-to-fix-compilation-error.patch
@@ -0,0 +1,39 @@
+From fa087747f349753af9347cfb0a76f19208296e01 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Wed, 28 Mar 2018 22:00:49 +0200
+Subject: [PATCH] replace -isystem with -I to fix compilation error
+
+---
+ mkspecs/common/clang.conf | 2 +-
+ mkspecs/common/gcc-base.conf | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
+index e003b94..5835c83 100644
+--- a/mkspecs/common/clang.conf
++++ b/mkspecs/common/clang.conf
+@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX
+ CONFIG += clang_pch_style
+ QMAKE_PCH_OUTPUT_EXT = .pch
+
+-QMAKE_CFLAGS_ISYSTEM = -isystem
++QMAKE_CFLAGS_ISYSTEM = -I
+ QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o
${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang
${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_LTCG = -flto
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 234f71d..ee3da02 100644
+--- a/mkspecs/common/gcc-base.conf
++++ b/mkspecs/common/gcc-base.conf
+@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g
+ QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
+ QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
+ QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
+-QMAKE_CFLAGS_ISYSTEM = -isystem
++QMAKE_CFLAGS_ISYSTEM = -I
+ QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
+ QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
+--
+2.16.3
+
diff --git a/shell-term-fm/zsh/DETAILS b/shell-term-fm/zsh/DETAILS
index 01129f6..e4e3aab 100755
--- a/shell-term-fm/zsh/DETAILS
+++ b/shell-term-fm/zsh/DETAILS
@@ -12,16 +12,16 @@ fi

SOURCE_URL[0]=cvs://:pserver:anonymous AT zsh.cvs.sourceforge.net:/cvsroot/zsh:zsh
elif [[ $ZSH_BUILD == "devel" ]];
then
- VERSION=5.3.1
-
SOURCE_HASH=sha512:25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:7825e4101905b6bfbd14f00b2f94f512ced5b9820a4f7b24409d266ad2c3c25144edf6aa2629317394055c51312ba57bb01e20c26e2ced1aeb0be0ff1a4d3fbb
SOURCE=$SPELL-$VERSION.tar.xz

SOURCE_URL[0]=http://downloads.sourceforge.net/project/$SPELL/$SPELL/${VERSION}/${SOURCE}
SOURCE_URL[1]=http://www.zsh.org/pub/${SOURCE}
SOURCE_URL[2]=ftp://ftp.zsh.org/zsh/${SOURCE}
elif [[ $ZSH_BUILD == "stable" ]];
then
- VERSION=5.3.1
-
SOURCE_HASH=sha512:25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:7825e4101905b6bfbd14f00b2f94f512ced5b9820a4f7b24409d266ad2c3c25144edf6aa2629317394055c51312ba57bb01e20c26e2ced1aeb0be0ff1a4d3fbb
SOURCE=$SPELL-$VERSION.tar.xz

SOURCE_URL[0]=http://downloads.sourceforge.net/project/$SPELL/$SPELL/${VERSION}/${SOURCE}
SOURCE_URL[1]=http://www.zsh.org/pub/${SOURCE}
diff --git a/shell-term-fm/zsh/HISTORY b/shell-term-fm/zsh/HISTORY
index 4e424d4..1b0ddf4 100644
--- a/shell-term-fm/zsh/HISTORY
+++ b/shell-term-fm/zsh/HISTORY
@@ -1,3 +1,6 @@
+2018-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.4.2
+
2017-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.3.1

diff --git a/utils/usbmon/DETAILS b/utils/usbmon/DETAILS
index 23205e7..0ebfc4c 100755
--- a/utils/usbmon/DETAILS
+++ b/utils/usbmon/DETAILS
@@ -1,9 +1,9 @@
SPELL=usbmon
- VERSION=5
- SOURCE=$SPELL.$VERSION.tar.gz
+ VERSION=6.1
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://people.redhat.com/zaitcev/linux/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-
SOURCE_HASH=sha512:ad0adaf120fc5d523513b58b1a70ff3ad9544e3369c55b3e37f04b6ed8b8e512efd80ceaf3fb22ef85528e8e9f7ecad5d0b50f06f95cb1a53000eca35f61a41f
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_HASH=sha512:580aa1edd6336ac86e562081a79698a98e6c7aa3dd8605a4c12201dd0e3ab1dc58b3d69f670742e007aeb76fb6ebfff9b5d10114df93814763e0c393b6473b54
WEB_SITE=http://people.redhat.com/zaitcev/linux/
ENTERED=20080625
LICENSE[0]=GPL
diff --git a/utils/usbmon/HISTORY b/utils/usbmon/HISTORY
index 5d9aa48..2158651 100644
--- a/utils/usbmon/HISTORY
+++ b/utils/usbmon/HISTORY
@@ -1,3 +1,6 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.1
+
2008-06-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, BUILD, INSTALL, HISTORY: created this spell, version 5

diff --git a/utils/usbutils/0001-fix-path-to-usb.ids.patch
b/utils/usbutils/0001-fix-path-to-usb.ids.patch
new file mode 100644
index 0000000..b293296
--- /dev/null
+++ b/utils/usbutils/0001-fix-path-to-usb.ids.patch
@@ -0,0 +1,102 @@
+From 44e10bd5205a14f218dc7bdb75c11671dfedbdb4 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Wed, 28 Mar 2018 20:49:42 +0200
+Subject: [PATCH] fix path to usb.ids
+
+---
+ Makefile.am | 6 +++---
+ Makefile.in | 6 +++---
+ configure | 4 ++--
+ configure.ac | 2 +-
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b18ff69..edc6169 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -43,11 +43,11 @@ EXTRA_DIST = \
+ usbutils.pc.in
+
+ lsusb.py: $(srcdir)/lsusb.py.in
+- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
++ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/lshw/usb.ids|g' $<
>$@
+ chmod 755 $@
+
+ lsusb.8: $(srcdir)/lsusb.8.in
+- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
++ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/lshw/usb.ids|g' $<
>$@
+
+ usb-devices.1: $(srcdir)/usb-devices.1.in
+ sed 's|VERSION|$(VERSION)|g' $< >$@
+@@ -56,7 +56,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = usbutils.pc
+
+ usbutils.pc: $(srcdir)/usbutils.pc.in
+- sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $<
>$@
++ sed 's|@usbids@|$(datadir)/lshw/usb.ids|g;s|@VERSION[@]|$(VERSION)|g'
$< >$@
+
+ DISTCLEANFILES = \
+ lsusb.py \
+diff --git a/Makefile.in b/Makefile.in
+index 997415b..e4a8f92 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1231,17 +1231,17 @@ uninstall-man: uninstall-man1 uninstall-man8
+
+
+ lsusb.py: $(srcdir)/lsusb.py.in
+- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
++ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/lshw/usb.ids|g' $<
>$@
+ chmod 755 $@
+
+ lsusb.8: $(srcdir)/lsusb.8.in
+- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
++ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/lshw/usb.ids|g' $<
>$@
+
+ usb-devices.1: $(srcdir)/usb-devices.1.in
+ sed 's|VERSION|$(VERSION)|g' $< >$@
+
+ usbutils.pc: $(srcdir)/usbutils.pc.in
+- sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $<
>$@
++ sed 's|@usbids@|$(datadir)/lshw/usb.ids|g;s|@VERSION[@]|$(VERSION)|g'
$< >$@
+
+ distclean-local:
+ rm -rf autom4te.cache
+diff --git a/configure b/configure
+index 8c145cc..6ec6065 100755
+--- a/configure
++++ b/configure
+@@ -6463,7 +6463,7 @@ fi
+ datadir: ${datadir}
+ mandir: ${mandir}
+
+- usb.ids: ${datadir}/usb.ids
++ usb.ids: ${datadir}/lshw/usb.ids
+
+ compiler: ${CC}
+ cflags: ${CFLAGS}
+@@ -6478,7 +6478,7 @@ $as_echo "
+ datadir: ${datadir}
+ mandir: ${mandir}
+
+- usb.ids: ${datadir}/usb.ids
++ usb.ids: ${datadir}/lshw/usb.ids
+
+ compiler: ${CC}
+ cflags: ${CFLAGS}
+diff --git a/configure.ac b/configure.ac
+index 9fbfa92..9453d51 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,7 @@ AC_MSG_RESULT([
+ datadir: ${datadir}
+ mandir: ${mandir}
+
+- usb.ids: ${datadir}/usb.ids
++ usb.ids: ${datadir}/lshw/usb.ids
+
+ compiler: ${CC}
+ cflags: ${CFLAGS}
+--
+2.16.3
+
diff --git a/utils/usbutils/DEPENDS b/utils/usbutils/DEPENDS
index ec2c8c1..a1c5cdf 100755
--- a/utils/usbutils/DEPENDS
+++ b/utils/usbutils/DEPENDS
@@ -1,2 +1,5 @@
-depends libusb &&
-depends DEVICE-MANAGER
+depends libusb &&
+depends DEVICE-MANAGER &&
+depends lshw &&
+
+depends automake
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index f4a6a87..3ff6f66 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,3 +1,7 @@
+2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on lshw
+ * PRE_BUILD, 0001-fix-path-to-usb.ids.patch: fix path to usb.ids
+
2018-03-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 009

diff --git a/utils/usbutils/PRE_BUILD b/utils/usbutils/PRE_BUILD
new file mode 100755
index 0000000..a858742
--- /dev/null
+++ b/utils/usbutils/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-path-to-usb.ids.patch" &&
+aclocal --force &&
+automake --force
+
diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index 91d1ce8..0e404cd 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,5 +1,5 @@
SPELL=youtube-dl
- VERSION=2018.03.20
+ VERSION=2018.03.26.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index aa13641..7321d08 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,6 @@
+2018-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2018.03.26.1
+
2018-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2018.03.19

diff --git a/xorg-proto/xcb-proto/DEPENDS b/xorg-proto/xcb-proto/DEPENDS
new file mode 100644
index 0000000..a86d429
--- /dev/null
+++ b/xorg-proto/xcb-proto/DEPENDS
@@ -0,0 +1 @@
+depends python
diff --git a/xorg-proto/xcb-proto/HISTORY b/xorg-proto/xcb-proto/HISTORY
index 86c2719..1f7835a 100644
--- a/xorg-proto/xcb-proto/HISTORY
+++ b/xorg-proto/xcb-proto/HISTORY
@@ -1,3 +1,6 @@
+2018-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on python
+
2018-03-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.13
* DETAILS: add gpg checking



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (496bd2ad8d3f727534b461ce0312288b0747a9a2), Florian Franzmann, 03/29/2018

Archive powered by MHonArc 2.6.24.

Top of Page