Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ec114fecee7739deaab7eeb92493e9114f89d952)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ec114fecee7739deaab7eeb92493e9114f89d952)
  • Date: Tue, 13 Dec 2022 19:44:45 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/libxcrypt/DETAILS | 7 +-
crypto/libxcrypt/HISTORY | 5 +
crypto/libxcrypt/xcrypt.gpg |binary
crypto/xmlsec/DETAILS | 4 -
crypto/xmlsec/HISTORY | 3
libs/clucene/HISTORY | 4 +
libs/clucene/PRE_BUILD | 4 -
libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch | 49
--------------
libs/clucene/patches/clucene-2.3.3.4-contribs_lib-1.patch | 49
++++++++++++++
libs/clucene/patches/ctime.patch | 11 +++
xorg-app/xhost/DETAILS | 4 -
xorg-app/xhost/HISTORY | 3
12 files changed, 85 insertions(+), 58 deletions(-)

New commits:
commit ec114fecee7739deaab7eeb92493e9114f89d952
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

clucen - fix build

commit fe7818f07e9cbae479501d0f090a5c7ac6a43daa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xhost: => 1.0.9

commit 409e03208c562d44c5f28a73e420812d31ea22c7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libxcrypt: => 4.4.33

commit d8df5c29e03b6de2f36028356fc641486270c713
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xmlsec: => 1.2.37

diff --git a/crypto/libxcrypt/DETAILS b/crypto/libxcrypt/DETAILS
index c416c9f..67b10c0 100755
--- a/crypto/libxcrypt/DETAILS
+++ b/crypto/libxcrypt/DETAILS
@@ -1,10 +1,13 @@
SPELL=libxcrypt
- VERSION=4.4.28
-
SOURCE_HASH=sha512:4371dd9a078c808a40288961634523dfa1f69abd1f4b9654f0562557c86726d3a7828c03a871bb03f01b3d0cf87389b55c9067a03871f5bd4d2d0649532045c2
+ VERSION=4.4.33
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/besser82/libxcrypt
SOURCE_URL[0]=$WEB_SITE/releases/download/v$VERSION/$SOURCE
+ SOURCE2=$SOURCE.asc
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=xcrypt.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature

#https://github.com/besser82/libxcrypt/releases/download/v4.4.28/libxcrypt-4.4.28.tar.xz
LICENSE[0]=LGPL2
ENTERED=20220512
diff --git a/crypto/libxcrypt/HISTORY b/crypto/libxcrypt/HISTORY
index b732a15..2aa8601 100644
--- a/crypto/libxcrypt/HISTORY
+++ b/crypto/libxcrypt/HISTORY
@@ -1,3 +1,8 @@
+2022-12-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: add gpg checking
+ * xcrypt.gpg: added
+ * DETAILS: version 4.4.33
+
2022-05-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.4.28
spell created
diff --git a/crypto/libxcrypt/xcrypt.gpg b/crypto/libxcrypt/xcrypt.gpg
new file mode 100644
index 0000000..fb4a456
Binary files /dev/null and b/crypto/libxcrypt/xcrypt.gpg differ
diff --git a/crypto/xmlsec/DETAILS b/crypto/xmlsec/DETAILS
index ab1b44b..006c6ec 100755
--- a/crypto/xmlsec/DETAILS
+++ b/crypto/xmlsec/DETAILS
@@ -1,6 +1,6 @@
SPELL=xmlsec
- VERSION=1.2.33
-
SOURCE_HASH=sha512:6354554b5cdc0a1389f6991efeac919bea912330b36d3be3d3496d61331e9edd2771786d50d2571a439f62ccfc3bd32be0a50bb5a037c4993aac076ad94b46e8
+ VERSION=1.2.37
+
SOURCE_HASH=sha512:99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900
SECURITY_PATCH=1
SOURCE=$SPELL${VERSION%%\.*}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL${VERSION%%\.*}-$VERSION
diff --git a/crypto/xmlsec/HISTORY b/crypto/xmlsec/HISTORY
index d341652..0d4c8c0 100644
--- a/crypto/xmlsec/HISTORY
+++ b/crypto/xmlsec/HISTORY
@@ -1,3 +1,6 @@
+2022-12-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.37
+
2022-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: switch to PKG-CONFIG provider (automated)

diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index 51c988c..52003bd 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,7 @@
+2022-12-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/ctime.patch: added
+ * PRE_BUILD: adjusted
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/libs/clucene/PRE_BUILD b/libs/clucene/PRE_BUILD
index b4771b8..24dbdd6 100755
--- a/libs/clucene/PRE_BUILD
+++ b/libs/clucene/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches

-if [ "$CLUCENE_BRANCH" != "stable" ]; then
- patch -p1 < "$SPELL_DIRECTORY/clucene-2.3.3.4-contribs_lib-1.patch"
-fi
diff --git a/libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch
b/libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch
deleted file mode 100644
index 7866eae..0000000
--- a/libs/clucene/clucene-2.3.3.4-contribs_lib-1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Submitted By: Igor Živković <contact AT igor-zivkovic.from.hr>
-Date: 2013-10-17
-Initial Package Version: 2.3.3.4
-Upstream Status: Reported
-Origin: Debian
-Description: Fixed building and installing of contribs-lib if
specified by config.
-
-diff -Naur clucene-2.3.3.4.orig/CMakeLists.txt clucene-2.3.3.4/CMakeLists.txt
---- clucene-2.3.3.4.orig/CMakeLists.txt 2013-10-17 11:32:30.064546492
+0200
-+++ clucene-2.3.3.4/CMakeLists.txt 2013-10-17 11:33:58.559550441 +0200
-@@ -163,7 +163,7 @@
- SET(BUILD_CONTRIBS_LIB 1)
- ENDIF ( BUILD_CONTRIBS )
- IF ( BUILD_CONTRIBS_LIB )
-- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
-+ ADD_SUBDIRECTORY (src/contribs-lib)
- ENDIF ( BUILD_CONTRIBS_LIB )
-
-
-diff -Naur clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt
clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt
---- clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt 2013-10-17
11:32:30.076546493 +0200
-+++ clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt 2013-10-17
11:33:58.560550441 +0200
-@@ -106,9 +106,26 @@
- )
- TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
-
-+#install public headers.
-+FOREACH(file ${HEADERS})
-+ get_filename_component(apath ${file} PATH)
-+ get_filename_component(aname ${file} NAME)
-+ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib
${apath})
-+ IF ( NOT aname MATCHES "^_.*" )
-+ install(FILES ${file}
-+ DESTINATION include/${relpath}
-+ COMPONENT development)
-+ ENDIF ( NOT aname MATCHES "^_.*" )
-+ENDFOREACH(file)
-+
- #set properties on the libraries
- SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
- VERSION ${CLUCENE_VERSION}
- SOVERSION ${CLUCENE_SOVERSION}
- COMPILE_DEFINITIONS_DEBUG _DEBUG
- )
-+
-+#and install library
-+install(TARGETS clucene-contribs-lib
-+ DESTINATION ${LIB_DESTINATION}
-+ COMPONENT runtime )
diff --git a/libs/clucene/patches/clucene-2.3.3.4-contribs_lib-1.patch
b/libs/clucene/patches/clucene-2.3.3.4-contribs_lib-1.patch
new file mode 100644
index 0000000..7866eae
--- /dev/null
+++ b/libs/clucene/patches/clucene-2.3.3.4-contribs_lib-1.patch
@@ -0,0 +1,49 @@
+Submitted By: Igor Živković <contact AT igor-zivkovic.from.hr>
+Date: 2013-10-17
+Initial Package Version: 2.3.3.4
+Upstream Status: Reported
+Origin: Debian
+Description: Fixed building and installing of contribs-lib if
specified by config.
+
+diff -Naur clucene-2.3.3.4.orig/CMakeLists.txt clucene-2.3.3.4/CMakeLists.txt
+--- clucene-2.3.3.4.orig/CMakeLists.txt 2013-10-17 11:32:30.064546492
+0200
++++ clucene-2.3.3.4/CMakeLists.txt 2013-10-17 11:33:58.559550441 +0200
+@@ -163,7 +163,7 @@
+ SET(BUILD_CONTRIBS_LIB 1)
+ ENDIF ( BUILD_CONTRIBS )
+ IF ( BUILD_CONTRIBS_LIB )
+- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
++ ADD_SUBDIRECTORY (src/contribs-lib)
+ ENDIF ( BUILD_CONTRIBS_LIB )
+
+
+diff -Naur clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt
clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt
+--- clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt 2013-10-17
11:32:30.076546493 +0200
++++ clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt 2013-10-17
11:33:58.560550441 +0200
+@@ -106,9 +106,26 @@
+ )
+ TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
+
++#install public headers.
++FOREACH(file ${HEADERS})
++ get_filename_component(apath ${file} PATH)
++ get_filename_component(aname ${file} NAME)
++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib
${apath})
++ IF ( NOT aname MATCHES "^_.*" )
++ install(FILES ${file}
++ DESTINATION include/${relpath}
++ COMPONENT development)
++ ENDIF ( NOT aname MATCHES "^_.*" )
++ENDFOREACH(file)
++
+ #set properties on the libraries
+ SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
+ VERSION ${CLUCENE_VERSION}
+ SOVERSION ${CLUCENE_SOVERSION}
+ COMPILE_DEFINITIONS_DEBUG _DEBUG
+ )
++
++#and install library
++install(TARGETS clucene-contribs-lib
++ DESTINATION ${LIB_DESTINATION}
++ COMPONENT runtime )
diff --git a/libs/clucene/patches/ctime.patch
b/libs/clucene/patches/ctime.patch
new file mode 100644
index 0000000..0f1fc09
--- /dev/null
+++ b/libs/clucene/patches/ctime.patch
@@ -0,0 +1,11 @@
+diff -uNr clucene-core-2.3.3.4.orig/src/core/CLucene/document/DateTools.cpp
clucene-core-2.3.3.4/src/core/CLucene/document/DateTools.cpp
+--- clucene-core-2.3.3.4.orig/src/core/CLucene/document/DateTools.cpp
2011-03-17 01:21:07.000000000 +0100
++++ clucene-core-2.3.3.4/src/core/CLucene/document/DateTools.cpp
2022-12-13 20:07:53.493774189 +0100
+@@ -8,6 +8,7 @@
+
+ #include "DateTools.h"
+ #include "CLucene/util/Misc.h"
++#include <ctime>
+
+ CL_NS_USE(util)
+ CL_NS_DEF(document)
diff --git a/xorg-app/xhost/DETAILS b/xorg-app/xhost/DETAILS
index 7ed7f6f..628cba4 100755
--- a/xorg-app/xhost/DETAILS
+++ b/xorg-app/xhost/DETAILS
@@ -1,7 +1,7 @@
SPELL=xhost
- VERSION=1.0.8
+ VERSION=1.0.9
PATCHLEVEL=1
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz

SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/app/${SOURCE}
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/xorg-app/xhost/HISTORY b/xorg-app/xhost/HISTORY
index 262c016..48358d0 100644
--- a/xorg-app/xhost/HISTORY
+++ b/xorg-app/xhost/HISTORY
@@ -1,3 +1,6 @@
+2022-12-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.9
+
2022-10-19 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: added missing dep on xtrans
* CONFIGURE, DEPENDS, BUILD: added support for libtirpc



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ec114fecee7739deaab7eeb92493e9114f89d952), Treeve Jelbert, 12/13/2022

Archive powered by MHonArc 2.6.24.

Top of Page