Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (eb21231cc79682f1bec9ab0acf2fe6079b3184f1)

Chronological Thread  
    < 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 (eb21231cc79682f1bec9ab0acf2fe6079b3184f1)
  • Date: Sun, 2 Jul 2023 20:22:48 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

disk/pmount/DETAILS | 1
disk/pmount/HISTORY | 9 +++
disk/pmount/PRE_BUILD | 3 -
disk/pmount/patches/0001-Remove-dbus-API-abuse.patch | 31 ++++++++++++
disk/pmount/patches/0002-Add-missing-include.patch | 32
+++++++++++++
disk/pmount/patches/0003-Add-exfat-and-f2fs-support.patch | 34
++++++++++++++
disk/pmount/pmount-0.9.13-no_close.patch | 11 ----
ftp/gnunet/DETAILS | 4 -
ftp/gnunet/HISTORY | 3 +
graphics/gocr/DETAILS | 4 -
graphics/gocr/HISTORY | 3 +
11 files changed, 119 insertions(+), 16 deletions(-)

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

gnunet 0.19.4

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

pmount: PATCHLEVEL++

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

pmount: Add exfat and f2fs support

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

pmount: Fix build against musl

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

pmount: Use apply_patch_dir

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

gocr 0.52

diff --git a/disk/pmount/DETAILS b/disk/pmount/DETAILS
index c771c42..de6a54f 100755
--- a/disk/pmount/DETAILS
+++ b/disk/pmount/DETAILS
@@ -1,5 +1,6 @@
SPELL=pmount
VERSION=0.9.23
+ PATCHLEVEL=1
SOURCE=${SPELL}_${VERSION}.orig.tar.bz2

SOURCE_HASH=sha512:a9d762fb9bd3f525d52b29a33c09c10a09f90fabdeed8f3658cb3fe8cbdbf237b2c9165b7c93a7170b9de5c65c513c1629b1fca638563a66d091c518782db92d
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/disk/pmount/HISTORY b/disk/pmount/HISTORY
index eae965e..a14decc 100644
--- a/disk/pmount/HISTORY
+++ b/disk/pmount/HISTORY
@@ -1,3 +1,12 @@
+2023-07-02 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: switch to using apply_patch_dir
+ * patches/0001-Remove-dbus-API-abuse.patch: patch normalised
+ * PRE_BUILD, patches/0002-Add-missing-include.patch:
+ fixed build against musl
+ * patches/0003-Add-exfat-and-f2fs-support.patch:
+ added exfat and f2fs support
+ * DETAILS: PATCHLEVEL++
+
2013-09-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9.23; updated source url and source
extension; fixed short description
diff --git a/disk/pmount/PRE_BUILD b/disk/pmount/PRE_BUILD
index 8d6a8dc..59683c8 100755
--- a/disk/pmount/PRE_BUILD
+++ b/disk/pmount/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/pmount-0.9.13-no_close.patch
+apply_patch_dir patches &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/disk/pmount/patches/0001-Remove-dbus-API-abuse.patch
b/disk/pmount/patches/0001-Remove-dbus-API-abuse.patch
new file mode 100644
index 0000000..60a0a55
--- /dev/null
+++ b/disk/pmount/patches/0001-Remove-dbus-API-abuse.patch
@@ -0,0 +1,31 @@
+From 62884b84c5b369fff1f7be30dc961e6dfaa95b22 Mon Sep 17 00:00:00 2001
+From: Unknown <unknown>
+Date: Tue, 8 May 2007 20:28:06 +0000
+Subject: [PATCH 1/3] Remove dbus API abuse
+
+The use of dbus_connection_close prevents a normal user from using
+pumount if a device was mounted with pmount-hal.
+
+Origin: Gentoo
+Upstream-Status: Unknown
+[ismael AT sourcemage.org: Edited description]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/pmount-hal.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/pmount-hal.c b/src/pmount-hal.c
+index 64acf48113e5..b185c1ae0089 100644
+--- a/src/pmount-hal.c
++++ b/src/pmount-hal.c
+@@ -401,7 +401,6 @@ main( int argc, const char** argv )
+ /* shut down hal connection */
+ libhal_ctx_shutdown( hal_ctx, &error );
+ libhal_ctx_free( hal_ctx );
+- dbus_connection_close( dbus_conn );
+ dbus_connection_unref( dbus_conn );
+
+ /* go */
+--
+2.40.1
+
diff --git a/disk/pmount/patches/0002-Add-missing-include.patch
b/disk/pmount/patches/0002-Add-missing-include.patch
new file mode 100644
index 0000000..9a4acb9
--- /dev/null
+++ b/disk/pmount/patches/0002-Add-missing-include.patch
@@ -0,0 +1,32 @@
+From a2e39b1243bc013827d76ccce5c631b04442458e Mon Sep 17 00:00:00 2001
+From: Enno Boland <gottox AT voidlinux.org>
+Date: Wed, 19 Aug 2015 10:41:04 +0200
+Subject: [PATCH 2/3] Add missing include
+
+The limits.h header must be included for PATH_MAX.
+
+Fixes build against musl libc.
+
+Origin: Void Linux
+Upstream-Status: Unknown
+[ismael AT sourcemage.org: Edited description]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/utils.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/utils.c b/src/utils.c
+index 2497cf575045..d78a38fd5b8e 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -22,6 +22,7 @@
+ #include <fcntl.h>
+ #include <signal.h>
+ #include <libintl.h>
++#include <limits.h>
+
+ /* File name used to tag directories created by pmount */
+ #define CREATED_DIR_STAMP ".created_by_pmount"
+--
+2.40.1
+
diff --git a/disk/pmount/patches/0003-Add-exfat-and-f2fs-support.patch
b/disk/pmount/patches/0003-Add-exfat-and-f2fs-support.patch
new file mode 100644
index 0000000..4a9f83f
--- /dev/null
+++ b/disk/pmount/patches/0003-Add-exfat-and-f2fs-support.patch
@@ -0,0 +1,34 @@
+From 4f8430abd627c739f2890d31aea1a535208bee00 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Sun, 2 Jul 2023 19:38:07 +0200
+Subject: [PATCH 3/3] Add exfat and f2fs support
+
+Inspired by patches from Gentoo and Void Linux.
+
+Credit to:
+- Bartosz Nitkiewicz <bartosz AT nitkiewicz.me>
+- Piotr Karbowski <slashbeast AT gentoo.org>
+
+Origin: Source Mage
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/fs.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/fs.c b/src/fs.c
+index 65ea0c7ab1d3..b4103d0a4455 100644
+--- a/src/fs.c
++++ b/src/fs.c
+@@ -44,6 +44,8 @@ static struct FS supported_fs[] = {
+ 1 /* skip detection */
+ },
+ { "ntfs", "nosuid,nodev,user", 1, "077", ",nls=%s" },
++ { "exfat", "nodev,nosuid,user", 1, "077" },
++ { "f2fs", "nodev,noauto,nosuid,user" },
+ { NULL, NULL, 0, NULL, 0}
+ };
+
+--
+2.40.1
+
diff --git a/disk/pmount/pmount-0.9.13-no_close.patch
b/disk/pmount/pmount-0.9.13-no_close.patch
deleted file mode 100644
index e03a7b3..0000000
--- a/disk/pmount/pmount-0.9.13-no_close.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN pmount-0.9.13.orig/src/pmount-hal.c pmount-0.9.13/src/pmount-hal.c
---- pmount-0.9.13.orig/src/pmount-hal.c 2006-12-02 16:59:56.000000000
-0600
-+++ pmount-0.9.13/src/pmount-hal.c 2006-12-02 17:00:16.000000000 -0600
-@@ -361,7 +361,6 @@
- /* shut down hal connection */
- libhal_ctx_shutdown( hal_ctx, &error );
- libhal_ctx_free( hal_ctx );
-- dbus_connection_close( dbus_conn );
- dbus_connection_unref( dbus_conn );
-
- /* go */
diff --git a/ftp/gnunet/DETAILS b/ftp/gnunet/DETAILS
index db413ff..7d6d8d2 100755
--- a/ftp/gnunet/DETAILS
+++ b/ftp/gnunet/DETAILS
@@ -1,8 +1,8 @@
SPELL=gnunet
- VERSION=0.19.0
+ VERSION=0.19.4
SOURCE=gnunet-${VERSION}.tar.gz
SOURCE_URL[0]=http://ftpmirror.gnu.org/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:be1f9c77e14172dae78a4f94254289e73123d840d0f090e70567223515adb8e2b937a52d925e1c44fd49a4bbbb0b943617f55606b9ceb22927b6de7d9470d966
+
SOURCE_HASH=sha512:c994269e009c6a97860e1903e87ab08b6f79a8f5bb7c27261020e90d162f81d908fe42173969331f3cada2086df8a719caa62c46342d59d46a2b2dd2fb71efa1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.gnunet.org
ENTERED=20050208
diff --git a/ftp/gnunet/HISTORY b/ftp/gnunet/HISTORY
index c7a1ada..6c543e1 100644
--- a/ftp/gnunet/HISTORY
+++ b/ftp/gnunet/HISTORY
@@ -1,3 +1,6 @@
+2023-07-02 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.19.4
+
2022-12-19 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.19.0

diff --git a/graphics/gocr/DETAILS b/graphics/gocr/DETAILS
index 043d125..0d3a2bd 100755
--- a/graphics/gocr/DETAILS
+++ b/graphics/gocr/DETAILS
@@ -1,6 +1,6 @@
SPELL=gocr
- VERSION=0.50
-
SOURCE_HASH=sha512:36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
+ VERSION=0.52
+
SOURCE_HASH=sha512:e2e6e690e7a32e32237c8b64b1a11719680c560592349df43f4b230f3c92bf324f98e473979b0913c42e33e8abbaf27952b6af173ea06eb5535878a9f608ce6d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www-e.uni-magdeburg.de/jschulen/ocr/$SOURCE
diff --git a/graphics/gocr/HISTORY b/graphics/gocr/HISTORY
index bb16e0b..1b9d4b7 100644
--- a/graphics/gocr/HISTORY
+++ b/graphics/gocr/HISTORY
@@ -1,3 +1,6 @@
+2023-07-02 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.52
+
2014-09-11 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 0.50


  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (eb21231cc79682f1bec9ab0acf2fe6079b3184f1), Ismael Luceno, 07/02/2023

Archive powered by MHonArc 2.6.24.

Top of Page