sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (c873f76f2138653bcb5c6fc722421160854b021a)
- 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 (c873f76f2138653bcb5c6fc722421160854b021a)
- Date: Sun, 26 Jul 2020 10:18:04 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
crypto/openssl/HISTORY | 4 +
crypto/openssl/PRE_BUILD | 5 +
crypto/openssl/man-section.patch | 57
+++++++++++++++
devel/bison/DETAILS | 2
devel/bison/HISTORY | 3
disk/xfsprogs/DETAILS | 4 -
disk/xfsprogs/HISTORY | 3
doc/man-pages/DETAILS | 1
doc/man-pages/HISTORY | 4 +
doc/man-pages/PRE_BUILD | 4 -
http/firefox/HISTORY | 3
http/firefox/mozconfig | 2
science/gpsbabel/0001-do-not-download-during-build.patch | 18 ++--
science/gpsbabel/DEPENDS | 14 ++-
science/gpsbabel/DETAILS | 15 ---
science/gpsbabel/HISTORY | 6 +
utils/fio/DETAILS | 4 -
utils/fio/HISTORY | 3
windowmanagers/i3/DETAILS | 2
windowmanagers/i3/FINAL | 5 -
windowmanagers/i3/HISTORY | 4 +
21 files changed, 121 insertions(+), 42 deletions(-)
New commits:
commit c873f76f2138653bcb5c6fc722421160854b021a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
http/firefox: remove -fpermissive flag
commit 879ce94cf589f6a9a4c9873dac3ca49942202734
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/gpsbabel: version 1.7.0
commit 06aa4a794943cd21d60e21ace64227b5e9e93dee
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
windowmanagers/i3: version 4.18.2
commit 2d6c062b3da24bc18573875c2f7a54afc3bfcd8c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Revert "bison: => 3.7"
Fails to link.
This reverts commit 99c03a3fddb350428adcced7c8118cf38ed4381b.
commit f83c38dcbe960dd2e4dea6f5f8d2ccfb0224accd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
doc/man-pages: remove conflicting files
commit 1f89a1df44db4393e473db1d5ccaa270efe4c2bd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
crypto/openssl: avoid conflict with shadow
commit 299e4213e2eba7f7df7459215bb2a4922b5da43f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
utils/fio: version 3.21
commit 6df1bf25b03261355e81ed6866881321ae086df8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
disk/xfsprogs: version 5.7.0
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index d098461..123e46f 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2020-07-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, man-section.patch: avoid conflict with files from shadow,
+ patch adapted from Debian
+
2020-04-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1.1g, SECURITY_PATCH++
diff --git a/crypto/openssl/PRE_BUILD b/crypto/openssl/PRE_BUILD
new file mode 100755
index 0000000..42981a6
--- /dev/null
+++ b/crypto/openssl/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/man-section.patch"
+
diff --git a/crypto/openssl/man-section.patch
b/crypto/openssl/man-section.patch
new file mode 100644
index 0000000..6a953a4
--- /dev/null
+++ b/crypto/openssl/man-section.patch
@@ -0,0 +1,57 @@
+From 7042262b52d2b7b40e2600d9ea727882a5374245 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sat, 25 Jul 2020 16:22:52 +0200
+Subject: [PATCH] Put manpages into their proper section
+
+---
+ Configurations/unix-Makefile.tmpl | 5 +++--
+ util/process_docs.pl | 3 ++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
+index 3a24d55..dc760ab 100644
+--- a/Configurations/unix-Makefile.tmpl
++++ b/Configurations/unix-Makefile.tmpl
+@@ -281,7 +281,8 @@ HTMLDIR=$(DOCDIR)/html
+ # MANSUFFIX is for the benefit of anyone who may want to have a suffix
+ # appended after the manpage file section number. "ssl" is popular,
+ # resulting in files such as config.5ssl rather than config.5.
+-MANSUFFIX=
++MANSUFFIX=ssl
++MANSECTION=SSL
+ HTMLSUFFIX=html
+
+ # For "optional" echo messages, to get "real" silence
+@@ -824,7 +825,7 @@ install_man_docs:
+ @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit
1)
+ @$(ECHO) "*** Installing manpages"
+ $(PERL) $(SRCDIR)/util/process_docs.pl \
+- "--destdir=$(DESTDIR)$(MANDIR)" --type=man
--suffix=$(MANSUFFIX)
++ "--destdir=$(DESTDIR)$(MANDIR)" --type=man
--suffix=$(MANSUFFIX) --mansection=$(MANSECTION)
+
+ uninstall_man_docs:
+ @$(ECHO) "*** Uninstalling manpages"
+diff --git a/util/process_docs.pl b/util/process_docs.pl
+index 30b149e..b3f8aa8 100755
+--- a/util/process_docs.pl
++++ b/util/process_docs.pl
+@@ -37,6 +37,7 @@ GetOptions(\%options,
+ 'type=s', # The result type, 'man' or 'html'
+ 'suffix:s', # Suffix to add to the extension.
+ # Only used with type=man
++ 'mansection:s', # Section to put to manpage in
+ 'remove', # To remove files rather than writing them
+ 'dry-run|n', # Only output file names on STDOUT
+ 'debug|D+',
+@@ -97,7 +98,7 @@ foreach my $section (sort @{$options{section}}) {
+ my $name = uc $podname;
+ my $suffix = { man => ".$podinfo{section}".($options{suffix} //
""),
+ html => ".html" } -> {$options{type}};
+- my $generate = { man => "pod2man --name=$name
--section=$podinfo{section} --center=OpenSSL --release=$config{version}
\"$podpath\"",
++ my $generate = { man => "pod2man --name=$name
--section=$podinfo{section}$options{mansection} --center=OpenSSL
--release=$config{version} \"$podpath\"",
+ html => "pod2html
\"--podroot=$options{sourcedir}\" --htmldir=$updir
--podpath=man1:man3:man5:man7 \"--infile=$podpath\" \"--title=$podname\"
--quiet"
+ } -> {$options{type}};
+ my $output_dir = catdir($options{destdir}, "man$podinfo{section}");
+--
+2.27.0
+
diff --git a/devel/bison/DETAILS b/devel/bison/DETAILS
index c161424..8d53366 100755
--- a/devel/bison/DETAILS
+++ b/devel/bison/DETAILS
@@ -1,5 +1,5 @@
SPELL=bison
- VERSION=3.7
+ VERSION=3.6.3
SOURCE=${SPELL}-${VERSION}.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/bison/HISTORY b/devel/bison/HISTORY
index 944c187..5f75df1 100644
--- a/devel/bison/HISTORY
+++ b/devel/bison/HISTORY
@@ -1,6 +1,3 @@
-2020-07-24 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.7
-
2020-06-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.6.3
diff --git a/disk/xfsprogs/DETAILS b/disk/xfsprogs/DETAILS
index f60b382..f959d52 100755
--- a/disk/xfsprogs/DETAILS
+++ b/disk/xfsprogs/DETAILS
@@ -1,9 +1,9 @@
SPELL=xfsprogs
- VERSION=5.6.0
+ VERSION=5.7.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/$SOURCE
-
SOURCE_HASH=sha512:a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
+
SOURCE_HASH=sha512:6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
LICENSE[0]=GPL
WEB_SITE=https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/
ENTERED=20020110
diff --git a/disk/xfsprogs/HISTORY b/disk/xfsprogs/HISTORY
index cede4e8..3a9cf42 100644
--- a/disk/xfsprogs/HISTORY
+++ b/disk/xfsprogs/HISTORY
@@ -1,3 +1,6 @@
+2020-07-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.7.0
+
2020-04-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.6.0
diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS
index 8a1a403..d317763 100755
--- a/doc/man-pages/DETAILS
+++ b/doc/man-pages/DETAILS
@@ -1,5 +1,6 @@
SPELL=man-pages
VERSION=5.07
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$KERNEL_URL/pub/linux/docs/man-pages/$SOURCE
diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY
index f0f6710..6505aa0 100644
--- a/doc/man-pages/HISTORY
+++ b/doc/man-pages/HISTORY
@@ -1,3 +1,7 @@
+2020-07-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD: remove getspnam.3 and passwd.5 which conflict with shadow
+ * DETAILS: PATCHLEVEL++
+
2020-06-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.07
diff --git a/doc/man-pages/PRE_BUILD b/doc/man-pages/PRE_BUILD
index da4af62..5f48da8 100755
--- a/doc/man-pages/PRE_BUILD
+++ b/doc/man-pages/PRE_BUILD
@@ -12,4 +12,6 @@ rm "${SOURCE_CACHE}/${SOURCE}" &&
SOURCE="${SOURCE}.xz" &&
-cd "${SOURCE_DIRECTORY}"
+cd "${SOURCE_DIRECTORY}" &&
+
+rm man3/getspnam.3 man5/passwd.5
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 911a970..190b9ea 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2020-07-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * mozconfig: remove -fpermissive flag, no longer necessary
+
2020-07-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS, PRE_BUILD, mozconfig: version 78.0.2
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
index 79b6c69..c90cd0b 100644
--- a/http/firefox/mozconfig
+++ b/http/firefox/mozconfig
@@ -21,7 +21,7 @@ ac_add_options --disable-updater
ac_add_options --disable-crashreporter
ac_add_options --prefix=${INSTALL_ROOT}/usr
ac_add_options --enable-release
-ac_add_options --enable-optimize="${CXXFLAGS} -fno-fast-math -fpermissive"
+ac_add_options --enable-optimize="${CXXFLAGS} -fno-fast-math"
ac_add_options --enable-rust-simd
ac_add_options --with-unsigned-addon-scopes=app,system
diff --git a/science/gpsbabel/0001-do-not-download-during-build.patch
b/science/gpsbabel/0001-do-not-download-during-build.patch
index 4466a8c..fd1398d 100644
--- a/science/gpsbabel/0001-do-not-download-during-build.patch
+++ b/science/gpsbabel/0001-do-not-download-during-build.patch
@@ -1,24 +1,24 @@
-From 51966b307deb21e0a35999aa2e2cc413fcdd9f9e Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Thu, 26 Feb 2015 20:23:53 +0100
-Subject: [PATCH] do not download during build
+From 5c7cc50ee395e5d1ac5d2d4337df9d2769ee9ec8 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sun, 26 Jul 2020 11:59:03 +0200
+Subject: [PATCH] Do not download during build
---
Makefile.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.in b/Makefile.in
-index c767fe2..e3da604 100644
+index 5ace8da..807c515 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -271,6 +271,7 @@ gpsbabel.html: FORCE # gpsbabel
+@@ -282,6 +282,7 @@ gpsbabel.html: FORCE # gpsbabel
--stringparam html.valid.html "1" \
--stringparam html.stylesheet \
- "http://www.gpsbabel.org/style3.css"; \
-+ --nonet \
+ "https://www.gpsbabel.org/style3.css"; \
++ --nonet \
http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
xmldoc/readme.xml
--
-2.1.0
+2.27.0
diff --git a/science/gpsbabel/DEPENDS b/science/gpsbabel/DEPENDS
index 13b6242..236e5d6 100755
--- a/science/gpsbabel/DEPENDS
+++ b/science/gpsbabel/DEPENDS
@@ -1,7 +1,11 @@
-depends libusb-compat &&
-depends expat &&
-optional_depends qt4 "" "" "for GUI support" &&
-if is_depends_enabled $SPELL qt4; then
- depends -sub CXX gcc
+depends expat &&
+depends zlib "--with-zlib=system" &&
+
+optional_depends libusb-compat "--with-libusb" "--without-libusb" "support
for libusb" &&
+
+optional_depends qtbase "" "" "for GUI support" &&
+if is_depends_enabled $SPELL qtbase; then
+ depends -sub CXX gcc &&
+ depends qttools
fi &&
optional_depends perl "" "" "to install documentation"
diff --git a/science/gpsbabel/DETAILS b/science/gpsbabel/DETAILS
index 0babd63..695a5f9 100755
--- a/science/gpsbabel/DETAILS
+++ b/science/gpsbabel/DETAILS
@@ -1,19 +1,10 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=gpsbabel
-if [[ $GPSBABEL_BRANCH == "scm" ]]; then
- VERSION=$(get_scm_version)
- SOURCE="$SPELL-scm.tar.bz2"
-
SOURCE_URL[0]="svn_http://${SPELL}.googlecode.com/svn/trunk/gpsbabel:$SPELL-scm";
- FORCE_DOWNLOAD=on
- SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
-else
- VERSION=1.5.2
+ VERSION=1.7.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://www.hawo.net/~siflfran/smgl/${SOURCE}
-
SOURCE_HASH=sha512:6c19856b893f4f15019e4c66a2f7e7cc490c1dd404c0830704ca50f42f3242d5c76557fb8e41b80e43f0a747899ebe3845331dca769f089fbddb6e6cf55ffe50
+ SOURCE_URL[0]=https://smgl.bandrate.org/GPSBabel-${VERSION}.tar.gz
+
SOURCE_HASH=sha512:b47bbea39b494f7a1c3c243d05d3fb0a50ffc747b9a759d0a1a5d5c603b144b1a1ec5146c74651688ce4009d055e10cd241680f558fabb0d72f483db1b9631b9
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-fi
if is_depends_enabled $SPELL perl; then
SOURCE2=gpsbabel.org-style3.css
SOURCE2_URL[0]=http://www.gpsbabel.org/style3.css
diff --git a/science/gpsbabel/HISTORY b/science/gpsbabel/HISTORY
index 8a49530..846801e 100644
--- a/science/gpsbabel/HISTORY
+++ b/science/gpsbabel/HISTORY
@@ -1,3 +1,9 @@
+2020-07-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.7.0
+ * 0001-do-not-download-during-build.patch: regenerate patch
+ * DEPENDS: use qt5, make the dependency on libusb-compat optional, use
+ system zlib
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)
diff --git a/utils/fio/DETAILS b/utils/fio/DETAILS
index 86633ae..26dae2e 100755
--- a/utils/fio/DETAILS
+++ b/utils/fio/DETAILS
@@ -1,8 +1,8 @@
SPELL=fio
- VERSION=3.20
+ VERSION=3.21
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://brick.kernel.dk/snaps/${SOURCE}
-
SOURCE_HASH=sha512:f1d86332f1c4d3da7cad64c3f805b410c3dbcda85a344201253a9f50236debfd46af6c88d237f69841d6fcc4b71cdea1576bbcfea76e5f4a2cd3f9fa978d1167
+
SOURCE_HASH=sha512:ad11754b239c907da25663380ea2570ddf81de12779dc1ab203b6a9108dc4c490c974b4d9896065bd9170e3820bcdd896e40617df94de3246d0c028b8de26738
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://github.com/axboe/fio";
LICENSE[0]=GPL
diff --git a/utils/fio/HISTORY b/utils/fio/HISTORY
index dc01a57..d973755 100644
--- a/utils/fio/HISTORY
+++ b/utils/fio/HISTORY
@@ -1,3 +1,6 @@
+2020-07-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.21
+
2020-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.20
diff --git a/windowmanagers/i3/DETAILS b/windowmanagers/i3/DETAILS
index 88767af..959700e 100755
--- a/windowmanagers/i3/DETAILS
+++ b/windowmanagers/i3/DETAILS
@@ -1,5 +1,5 @@
SPELL=i3
- VERSION=4.18.1
+ VERSION=4.18.2
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://${SPELL}wm.org/downloads/${SOURCE}
diff --git a/windowmanagers/i3/FINAL b/windowmanagers/i3/FINAL
deleted file mode 100755
index 7a05a58..0000000
--- a/windowmanagers/i3/FINAL
+++ /dev/null
@@ -1,5 +0,0 @@
-message "${DISPEL_COLOR}If you are using the nVidia binary graphics driver"
-message "older than 302.17, you need to use --force-xinerama (in your
.xsession)"
-message "when starting i3, like so:"
-message "exec i3 --force-xinerama -V >>~/.i3/i3log 2>&1"
-message "or use ${DEFAULT_COLOR}force_xinerama yes${DISPEL_COLOR} in your
configuration file.${DEFAULT_COLOR}"
diff --git a/windowmanagers/i3/HISTORY b/windowmanagers/i3/HISTORY
index f563cdc..178179c 100644
--- a/windowmanagers/i3/HISTORY
+++ b/windowmanagers/i3/HISTORY
@@ -1,3 +1,7 @@
+2020-07-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.18.2
+ * FINAL: remove obsolete hint
+
2020-04-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.18.1
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c873f76f2138653bcb5c6fc722421160854b021a), Florian Franzmann, 07/26/2020
Archive powered by MHonArc 2.6.24.