Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1186a61482bd37b8eede951e4edbb6301749ba99)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1186a61482bd37b8eede951e4edbb6301749ba99)
  • Date: Mon, 30 May 2022 15:43:45 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 3
disk/samdisk/CONFIGURE | 1
disk/samdisk/DEPENDS | 1
disk/samdisk/DETAILS | 20 ++++++
disk/samdisk/HISTORY | 2
gnu/gcc/0001-Do-not-attempt-to-use-mallinfo2.patch | 34 ----------
gnu/gcc/0003-fix-header-generation-for-libgo.patch | 36 -----------
gnu/gcc/HISTORY | 5 +
gnu/gcc/PRE_BUILD | 20 ------
gnu/gcc/ssp_nonshared.diff | 14 ----
http/dillo/HISTORY | 4 +
http/dillo/PRE_BUILD | 1
http/dillo/patches/fix-OpenSSL-1.1-detection.patch | 68
+++++++++++++++++++++
security/nmap/DETAILS | 4 -
security/nmap/HISTORY | 3
15 files changed, 111 insertions(+), 105 deletions(-)

New commits:
commit 1186a61482bd37b8eede951e4edbb6301749ba99
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gcc: Remove obsolete patches

commit 944944f260c3fcc5448f6a0f463bff9dd6f35bca
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

samdisk: new spell, portable disk image utility

commit 6aa7bd5ed47c31db71170cfd518c417588680930
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dillo: Fix build against OpenSSL 1.1 API

commit d3ba1672f6393775ddada5a3c693127036cd455e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

nmap 7.92

diff --git a/ChangeLog b/ChangeLog
index e14c4e8..ef42fe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2022-05-30 Ismael Luceno <ismael AT sourcemage.org>
+ * disk/samdisk: new spell, portable disk image utility
+
2022-05-28 Florian Franzmann <bwlf AT bandrate.org>
* MESON_CONFIGURE: offer plain as first option since that is
what the meson docs recommend for distributions
diff --git a/disk/samdisk/CONFIGURE b/disk/samdisk/CONFIGURE
new file mode 100755
index 0000000..b1e2770
--- /dev/null
+++ b/disk/samdisk/CONFIGURE
@@ -0,0 +1 @@
+. "$GRIMOIRE"/CMAKE_CONFIGURE
diff --git a/disk/samdisk/DEPENDS b/disk/samdisk/DEPENDS
new file mode 100755
index 0000000..bd2c258
--- /dev/null
+++ b/disk/samdisk/DEPENDS
@@ -0,0 +1 @@
+. "$GRIMOIRE"/CMAKE_DEPENDS
diff --git a/disk/samdisk/DETAILS b/disk/samdisk/DETAILS
new file mode 100755
index 0000000..dce7eb3
--- /dev/null
+++ b/disk/samdisk/DETAILS
@@ -0,0 +1,20 @@
+. "$GRIMOIRE"/CMAKE_FUNCTIONS
+ SPELL=samdisk
+ VERSION=20200607
+ SOURCE="$SPELL-$VERSION.tar.gz"
+
SOURCE_URL[0]=https://github.com/simonowen/$SPELL/archive/refs/tags/$VERSION.tar.gz
+
SOURCE_HASH=sha512:c92a32e2c1e81153f15b8f694a2210bdbd5eb7265af29d98751c911413602120ccb56804ce82d787cfc0a59f0fa55ba87a4adcb3ed8f7a046a1f22956dea0de5
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="https://simonowen.com/samdisk/";
+ LICENSE[0]="MIT"
+ ENTERED=20220530
+ KEYWORDS=""
+ SHORT="portable disk image utility"
+cat << EOF
+A portable disk image utility, specialising in copy-protected PC-compatible
+formats.
+
+Read and write almost any soft-sectored floppy disk format compatible with
+the PC floppy controller. Also supports hard disk imaging to and from HDF
+and raw formats.
+EOF
diff --git a/disk/samdisk/HISTORY b/disk/samdisk/HISTORY
new file mode 100644
index 0000000..739f50a
--- /dev/null
+++ b/disk/samdisk/HISTORY
@@ -0,0 +1,2 @@
+2022-05-30 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFIGURE, DEPENDS, DETAILS: spell created
diff --git a/gnu/gcc/0001-Do-not-attempt-to-use-mallinfo2.patch
b/gnu/gcc/0001-Do-not-attempt-to-use-mallinfo2.patch
deleted file mode 100644
index 42f2100..0000000
--- a/gnu/gcc/0001-Do-not-attempt-to-use-mallinfo2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 12ee9a33c0c5127451384fb1ee1c3c3314651384 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <Florian.Franzmann AT bandrate.org>
-Date: Fri, 30 Apr 2021 22:32:09 +0200
-Subject: [PATCH] Do not attempt to use mallinfo2
-
----
- gcc/configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/configure b/gcc/configure
-index e8ecb3b02..a69d5a41b 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -10363,7 +10363,7 @@ fi
- for ac_func in times clock kill getrlimit setrlimit atoq \
- popen sysconf strsignal getrusage nl_langinfo \
- gettimeofday mbstowcs wcswidth mmap posix_fallocate setlocale \
-- clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked
fgetc_unlocked fgets_unlocked fileno_unlocked fprintf_unlocked
fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked
getchar_unlocked getc_unlocked putchar_unlocked putc_unlocked madvise
mallinfo mallinfo2 fstatat
-+ clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked
fgetc_unlocked fgets_unlocked fileno_unlocked fprintf_unlocked
fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked
getchar_unlocked getc_unlocked putchar_unlocked putc_unlocked madvise
mallinfo fstatat
- do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -11800,7 +11800,7 @@ fi
- done
-
-
--for ac_func in mallinfo mallinfo2
-+for ac_func in mallinfo
- do
- ac_tr_decl=`$as_echo "HAVE_DECL_$ac_func" | $as_tr_cpp`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func is
declared" >&5
---
-2.31.1
-
diff --git a/gnu/gcc/0003-fix-header-generation-for-libgo.patch
b/gnu/gcc/0003-fix-header-generation-for-libgo.patch
deleted file mode 100644
index bef60d0..0000000
--- a/gnu/gcc/0003-fix-header-generation-for-libgo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6bcb304485fca4e6149a1bbd8085da2d42042d37 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Sun, 24 Feb 2013 12:00:25 +0100
-Subject: [PATCH 3/3] fix header generation for libgo
-
----
- libgo/mksysinfo.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 315d60c..10c888c 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -538,7 +538,7 @@ if test "$rusage" != ""; then
- rusage=`echo $rusage | sed -e 's/^ *//'`
- nrusage=
- while test -n "$rusage"; do
-- field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
-+ field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/' -e 's/struct
\(.*\)/struct { \1; }/'`
- rusage=`echo $rusage | sed -e 's/^[^;]*; *\(.*\)$/\1/'`
- # Drop the leading ru_, capitalize the next character.
- field=`echo $field | sed -e 's/^ru_//'`
-@@ -550,7 +550,9 @@ if test "$rusage" != ""; then
- r=`echo $r | sed -e s'/ _timespec$/ Timespec/'`
- r=`echo $r | sed -e s'/ _timestruc_t$/ Timestruc/'`
- field="$f$r"
-- nrusage="$nrusage $field;"
-+ if [ -n "$field" ]; then
-+ nrusage="$nrusage $field;"
-+ fi
- done
- echo "type Rusage struct {$nrusage }" >> ${OUT}
- else
---
-1.8.1.3
-
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 8adcbda..0dc4968 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,8 @@
+2022-05-30 Ismael Luceno <ismael AT sourcemage.org>
+ * 0003-fix-header-generation-for-libgo.patch,
+ 0001-Do-not-attempt-to-use-mallinfo2.patch,
+ ssp_nonshared.diff: removed, lo longer needed
+
2022-05-27 Florian Franzmann <bwlf AT bandrate.org>
* PREPARE, UP_TRIGGERS: fix message colors
* BUILD: set --enable-host-shared if jit has been selected
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index cc066c2..d09ea99 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -39,22 +39,4 @@ mk_source_dir $SOURCE_DIRECTORY.bld &&
cd $SOURCE_DIRECTORY &&

sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &&
-sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&
-
-if list_find "$GCC_COMPILER" "go"; then
- message "${MESSAGE_COLOR}Applying patch for Go header
generation...${DEFAULT_COLOR}" &&
- patch -p1 < "$SPELL_DIRECTORY/0003-fix-header-generation-for-libgo.patch"
-fi &&
-
-case "$HOST" in
-*-musl)
- patch -fp1 -i "$SPELL_DIRECTORY/ssp_nonshared.diff"
- ;;
-esac &&
-
-# work around wrong detection of mallinfo2():
-if is_version_less $(installed_version glibc) 2.33; then
- patch -p1 < "$SPELL_DIRECTORY/0001-Do-not-attempt-to-use-mallinfo2.patch"
-fi
-
-#grep -lR "struct ucontext\>" libgcc | xargs sed -i -e 's/struct
ucontext\>/ucontext_t/'
+sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
diff --git a/gnu/gcc/ssp_nonshared.diff b/gnu/gcc/ssp_nonshared.diff
deleted file mode 100644
index 2d3e586..0000000
--- a/gnu/gcc/ssp_nonshared.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index c48178f1aa3..e2fae4ef055 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -863,7 +863,8 @@ proper position among the other output files. */
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-- "|fstack-protector-strong|fstack-protector-explicit:}"
-+ "|fstack-protector-strong|fstack-protector-explicit" \
-+ ":-lssp_nonshared}"
- #else
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- "|fstack-protector-strong|fstack-protector-explicit" \
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index 61259c7..0cfc99f 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,7 @@
+2022-05-30 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/fix-OpenSSL-1.1-detection.patch:
+ fixed build against OpenSSL 1.1 API
+
2020-12-23 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: fixed build with binutils 2.35+

diff --git a/http/dillo/PRE_BUILD b/http/dillo/PRE_BUILD
index 70ab668..b90c44a 100755
--- a/http/dillo/PRE_BUILD
+++ b/http/dillo/PRE_BUILD
@@ -3,4 +3,5 @@ cd "$SOURCE_DIRECTORY" &&
if [[ "$DILLO_CVS" == "y" ]]; then
./autogen.sh
fi &&
+apply_patch_dir patches &&
sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/http/dillo/patches/fix-OpenSSL-1.1-detection.patch
b/http/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 0000000..c38d5d3
--- /dev/null
+++ b/http/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,68 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe AT debian.org>
+Forwarded:
http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+[ismael AT sourcemage.org: Edited to remove redundant cast]
+
+--- a/configure 2015-06-30 16:07:22.000000000 +0200
++++ b/configure 2015-06-30 16:07:22.000000000 +0200
+@@ -6002,9 +6002,9 @@
+
+ if test "x$ssl_ok" = "xyes"; then
+ old_libs="$LIBS"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init
in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl"
>&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_ssl_SSL_library_init=yes
++ ac_cv_lib_ssl_SSL_new=yes
+ else
+- ac_cv_lib_ssl_SSL_library_init=no
++ ac_cv_lib_ssl_SSL_new=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+ ssl_ok=yes
+ else
+ ssl_ok=no
+--- a/dpi/https.c
++++ b/dpi/https.c
+@@ -476,7 +476,7 @@
+ case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+ /*Either self signed and untrusted*/
+ /*Extract CN from certificate name information*/
+- if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) ==
NULL) {
+ strcpy(buf, "(no CN given)");
+ } else {
+ char *cn_end;
diff --git a/security/nmap/DETAILS b/security/nmap/DETAILS
index c1f52d0..21ed486 100755
--- a/security/nmap/DETAILS
+++ b/security/nmap/DETAILS
@@ -1,10 +1,10 @@
SPELL=nmap
- VERSION=7.90
+ VERSION=7.92
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://nmap.org/dist/$SOURCE
SOURCE_URL[1]=https://sectools.org/nmap/$SOURCE
-
SOURCE_HASH=sha512:b77c31ef43c9a069f0f63a3cc166021f714a8664cca4d51d1b8467cb166f5e3acb4a4bd0f2bdad7f87777a506ef56cc54fa094e664997c8e436b50208214e7c6
+
SOURCE_HASH=sha512:7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
WEB_SITE=https://nmap.org/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index 8d49537..a4c8b6b 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,6 @@
+2022-05-30 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 7.92
+
2020-12-03 David C. Haley <khoralin AT gmail.com>
* DETAILS: version bump to 7.90
* DEPENDS: added python



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1186a61482bd37b8eede951e4edbb6301749ba99), Ismael Luceno, 05/30/2022

Archive powered by MHonArc 2.6.24.

Top of Page