[packages/jasper] - bcond for experimental libheif support
commit f4ab136f491171675ab7d4e96eb68a69b536ee04
Author: Marcin Krol
Date: Sun Dec 3 13:33:00 2023 +0100
- bcond for experimental libheif support
jasper.spec | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/jasper.spec b/jasper.spec
index 15e38a4..f271d18 100644
--- a/jasper.spec
+++ b/jasper.spec
@@ -1,12 +1,13 @@
#
# Conditional build:
%bcond_without opengl # (OpenGL-based) jiv viewer
+%bcond_without libheif # support for libheif and HEIC codec (experimental)
#
Summary: JasPer - collection of software for coding and manipulation of
images
Summary(pl.UTF-8): JasPer - zestaw oprogramowania do obróbki obrazków
Name: jasper
Version: 3.0.6
-Release: 1
+Release: 2
Epoch: 0
License: JasPer v2.0 (BSD-like)
Group: Libraries
@@ -19,6 +20,7 @@ URL: https://www.ece.uvic.ca/~frodo/jasper/
BuildRequires: cmake >= 3.12
BuildRequires: doxygen
BuildRequires: gcc >= 6:4.7
+%{?with_libheif:BuildRequires: libheif-devel}
BuildRequires: libjpeg-devel
BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: tex-latex-adjustbox
@@ -109,7 +111,9 @@ cd builddir
-DCMAKE_INSTALL_INCLUDEDIR:PATH=include \
-DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
-DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF \
- -DJAS_ENABLE_OPENGL=ON
+ %{!?with_opengl:-DJAS_ENABLE_OPENGL=OFF} \
+ %{!?with_libheif:-DJAS_ENABLE_LIBHEIF=OFF} \
+ %{!?with_libheif:-DJAS_INCLUDE_HEIC_CODEC=OFF}
%{__make}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jasper.git/commitdiff/f4ab136f491171675ab7d4e96eb68a69b536ee04
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/yajl] - empty debugsource, disable it
commit 44765407e985806c57bef3d11f655c8e8aabb354
Author: Marcin Krol
Date: Sun Dec 3 00:54:05 2023 +0100
- empty debugsource, disable it
yajl.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/yajl.spec b/yajl.spec
index 6243c0c..9c6b2b1 100644
--- a/yajl.spec
+++ b/yajl.spec
@@ -16,6 +16,8 @@ URL: http://lloyd.github.io/yajl/
BuildRequires: cmake >= 2.6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define_debugsource_packages 0
+
%description
YAJL (Yet Another JSON Library) is a JSON parsing library written in
C.
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/yajl.git/commitdiff/44765407e985806c57bef3d11f655c8e8aabb354
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/sgml-common] - rediffed
commit d6eccd838e5bc805eeb29993de00cfe3e83a5abf
Author: Marcin Krol
Date: Sat Dec 2 23:50:38 2023 +0100
- rediffed
sgml-common-chmod.patch | 16
sgml-common.spec| 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/sgml-common.spec b/sgml-common.spec
index cf5e0c2..70dd9e7 100644
--- a/sgml-common.spec
+++ b/sgml-common.spec
@@ -2,7 +2,7 @@ Summary:Common SGML catalog and DTD files
Summary(pl.UTF-8): Opisane w normie ISO 8879/1986 katalogi i DTD SGML-owe
Name: sgml-common
Version: 0.6.3
-Release: 8
+Release: 9
#Copyright:(C) International Organization for Standardization 1986
License: distributable
URL: http://www.iso.ch/cate/3524030.html
diff --git a/sgml-common-chmod.patch b/sgml-common-chmod.patch
index a95985f..c249d88 100644
--- a/sgml-common-chmod.patch
+++ b/sgml-common-chmod.patch
@@ -1,8 +1,8 @@
-diff -Nur --exclude *~ sgml-common-0.5/bin/install-catalog
sgml-common-0.5.new/bin/install-catalog
sgml-common-0.5/bin/install-catalog.in Mon Feb 12 15:43:14 2001
-+++ sgml-common-0.5.new/bin/install-catalog.in Mon Feb 12 15:46:26 2001
-@@ -133,12 +133,14 @@
- echo "Warning: $SGML_ORDINARY is already installed in the centralized
catalog $SGML_CENTRALIZED"
+diff -urNp -x '*.orig' sgml-common-0.6.3.org/bin/install-catalog.in
sgml-common-0.6.3/bin/install-catalog.in
+--- sgml-common-0.6.3.org/bin/install-catalog.in 2001-01-12
16:35:39.0 +0100
sgml-common-0.6.3/bin/install-catalog.in 2023-12-02 23:50:22.637916811
+0100
+@@ -133,12 +133,14 @@ case $SGML_ACTION in
+ echo "Warning: $SGML_ORDINARY is already installed in the centralized
catalog $SGML_CENTRALIZED" >&2
else
echo "$SGML_POINTER $SGML_ORDINARY" >> $SGML_CENTRALIZED
+chmod 644 $SGML_CENTRALIZED
@@ -16,15 +16,15 @@ diff -Nur --exclude *~ sgml-common-0.5/bin/install-catalog
sgml-common-0.5.new/b
fi
;;
removal)
-@@ -147,6 +149,7 @@
+@@ -147,6 +149,7 @@ case $SGML_ACTION in
then
sed -e "\:$SGML_POINTER $SGML_ORDINARY:d" < $SGML_CENTRALIZED >
${SGML_CENTRALIZED}.new
mv ${SGML_CENTRALIZED}.new $SGML_CENTRALIZED
+chmod 644 $SGML_CENTRALIZED
else
- echo "Warning: $SGML_ORDINARY was not found in the centralized
catalog $SGML_CENTRALIZED"
+ echo "Warning: $SGML_ORDINARY was not found in the centralized
catalog $SGML_CENTRALIZED" >&2
fi
-@@ -156,6 +159,7 @@
+@@ -156,6 +159,7 @@ case $SGML_ACTION in
echo "`basename $0`: removal of $SGML_CENTRALIZED from
/etc/sgml/catalog"
sed -e "\:$SGML_POINTER $SGML_CENTRALIZED:d" < /etc/sgml/catalog >
/etc/sgml/catalog.new
mv /etc/sgml/catalog.new /etc/sgml/catalog
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sgml-common.git/commitdiff/d6eccd838e5bc805eeb29993de00cfe3e83a5abf
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/net-tools] - rediffed
commit 581b25667e45f057ec34ffcc9b347982f1e23027
Author: Marcin Krol
Date: Sat Dec 2 23:35:53 2023 +0100
- rediffed
net-tools-interface.patch| 34 +--
net-tools-netstat-netlink-diag.patch | 65 +++-
net-tools.spec | 4 +--
3 files changed, 53 insertions(+), 50 deletions(-)
---
diff --git a/net-tools.spec b/net-tools.spec
index 7e98cf2..daf5678 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -9,7 +9,7 @@ Summary(ru.UTF-8): Базовые сетевые программы
Summary(uk.UTF-8): Базові програми мережі
Name: net-tools
Version: 2.10
-Release: 1
+Release: 2
License: GPL v2+
Group: Networking/Admin
Source0:
https://sourceforge.net/projects/net-tools/files/%{name}-%{version}.tar.xz
@@ -120,7 +120,7 @@ maszyny połączonej poprzez PLIP.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p0
+%patch5 -p1
%patch6 -p1
%build
diff --git a/net-tools-interface.patch b/net-tools-interface.patch
index 4c0e5b7..c025bb4 100644
--- a/net-tools-interface.patch
+++ b/net-tools-interface.patch
@@ -1,8 +1,8 @@
-diff -up net-tools-2.0/man/en_US/netstat.8.interface
net-tools-2.0/man/en_US/netstat.8
net-tools-2.0/man/en_US/netstat.8.interface2014-11-24
14:52:45.648623478 +0100
-+++ net-tools-2.0/man/en_US/netstat.8 2014-11-24 14:53:32.294972184 +0100
-@@ -49,9 +49,9 @@ netstat \- Print network connections, ro
- .RB [delay]
+diff -urNp -x '*.orig' net-tools-2.10.org/man/en_US/netstat.8
net-tools-2.10/man/en_US/netstat.8
+--- net-tools-2.10.org/man/en_US/netstat.8 2021-01-07 00:22:35.0
+0100
net-tools-2.10/man/en_US/netstat.8 2023-12-02 23:35:08.827986462 +0100
+@@ -47,9 +47,9 @@ netstat \- Print network connections, ro
+ .RB [ \-\-continuous | \-c ]
.P
.B netstat
-.RB { \-\-interfaces | \-i }
@@ -13,7 +13,7 @@ diff -up net-tools-2.0/man/en_US/netstat.8.interface
net-tools-2.0/man/en_US/net
.RB [ \-\-verbose | \-v ]
.RB [ \-\-program | \-p ]
.RB [ \-\-numeric | \-n ]
-@@ -134,8 +134,8 @@ and
+@@ -128,8 +128,8 @@ and
produce the same output.
.SS "\-\-groups, \-g"
Display multicast group membership information for IPv4 and IPv6.
@@ -24,10 +24,10 @@ diff -up net-tools-2.0/man/en_US/netstat.8.interface
net-tools-2.0/man/en_US/net
.SS "\-\-masquerade, \-M"
Display a list of masqueraded connections.
.SS "\-\-statistics, \-s"
-diff -up net-tools-2.0/netstat.c.interface net-tools-2.0/netstat.c
net-tools-2.0/netstat.c.interface 2014-11-24 14:52:45.644623534 +0100
-+++ net-tools-2.0/netstat.c2014-11-24 14:52:45.652623422 +0100
-@@ -144,6 +144,7 @@ static char *Release = RELEASE, *Signatu
+diff -urNp -x '*.orig' net-tools-2.10.org/netstat.c net-tools-2.10/netstat.c
+--- net-tools-2.10.org/netstat.c 2023-12-02 23:35:08.762985691 +0100
net-tools-2.10/netstat.c 2023-12-02 23:35:08.827986462 +0100
+@@ -149,6 +149,7 @@ static char *Release = RELEASE, *Signatu
#define E_IOCTL -3
int flag_int = 0;
@@ -35,7 +35,7 @@ diff -up net-tools-2.0/netstat.c.interface
net-tools-2.0/netstat.c
int flag_rou = 0;
int flag_mas = 0;
int flag_sta = 0;
-@@ -2083,6 +2083,7 @@ static int rfcomm_info(void)
+@@ -2132,6 +2133,7 @@ static int rfcomm_info(void)
static int iface_info(void)
{
@@ -43,8 +43,8 @@ diff -up net-tools-2.0/netstat.c.interface
net-tools-2.0/netstat.c
if (skfd < 0) {
if ((skfd = sockets_open(0)) < 0) {
perror("socket");
-@@ -1802,7 +1804,11 @@ static int iface_info(void)
- printf(_("Iface MTURX-OK RX-ERR RX-DRP RX-OVRTX-OK
TX-ERR TX-DRP TX-OVR Flg\n"));
+@@ -2144,7 +2146,11 @@ static int iface_info(void)
+ printf(_("Iface MTURX-OK RX-ERR RX-DRP RX-OVRTX-OK
TX-ERR TX-DRP TX-OVR Flg\n"));
}
-if (for_all_interfaces(do_if_print, _all) < 0) {
@@ -56,7 +56,7 @@ diff -up net-tools-2.0/netstat.c.interface
net-tools-2.0/netstat.c
perror(_("missing interface information"));
exit(1);
}
-@@ -1825,10 +1825,11 @@ static void usage(int rc)
+@@ -2171,10 +2177,11 @@ static void usage(int rc)
FILE *fp = rc ? stderr : stdout;
fprintf(fp, _("usage: netstat [-vWeenNcCF] [] -r netstat
{-V|--version|-h|--help}\n"));
fprintf(fp, _(" netstat [-vWnNcaeol] [ ...]\n"));
@@ -69,7 +69,7 @@ diff -up net-tools-2.0/netstat.c.interface
net-tools-2.0/netstat.c
fprintf(fp, _("-g, --groups display multicast group
memberships\n"));
fprintf(fp, _("-s, --statistics display networking
statistics (like SNMP)\n"));
#if HAVE_FW_MASQUERADE
-@@ -1875,7 +1882,7 @@ int main
+@@ -2217,7 +2224,7 @@ int main
{
AFTRANS_OPTS,
{"version", 0, 0, 'V'},
@@ -78,7 +78,7 @@ diff -up net-tools-2.0/netstat.c.interface
net-tools-2.0/netstat.c
{"help", 0, 0, 'h'},
{"route", 0, 0, 'r'},
#if HAVE_FW_MASQUERADE
-@@ -1919,7 +1926,7 @@
[packages/vim] - libcanberra is enabled only with gnome and with heavy
commit 21a960d9d3ef66201d28cdfa60c9be0105018e1a
Author: Marcin Krol
Date: Sat Dec 2 23:27:00 2023 +0100
- libcanberra is enabled only with gnome and with heavy
vim.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/vim.spec b/vim.spec
index 70188bb..278defd 100644
--- a/vim.spec
+++ b/vim.spec
@@ -143,7 +143,9 @@ BuildRequires: gtk+3-devel >= 3.0
BuildRequires: gtk+2-devel >= 2:2.6.0
%endif
%endif
+%if %{with gnome} || %{with heavy}
BuildRequires: libcanberra-devel
+%endif
%{?with_gnome:BuildRequires: libgnomeui-devel >= 2.2.0.1}
%if %{with selinux} || %{with heavy}
BuildRequires: libselinux-devel
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/21a960d9d3ef66201d28cdfa60c9be0105018e1a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gtk4] - media dir is not created unless at least one media plugin is built
commit fddd72f26c6c7d2b3f52e6c889ffa82eb4bfe9c9
Author: Marcin Krol
Date: Sat Dec 2 22:55:05 2023 +0100
- media dir is not created unless at least one media plugin is built
gtk4.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/gtk4.spec b/gtk4.spec
index 92db53a..d211c13 100644
--- a/gtk4.spec
+++ b/gtk4.spec
@@ -444,7 +444,9 @@ exit 0
%dir %{_libdir}/gtk-4.0/%{abivers}
%dir %{_libdir}/gtk-4.0/%{abivers}/immodules
%dir %{_libdir}/gtk-4.0/%{abivers}/inspector
+%if %{with ffmpeg} || %{with gstreamer}
%dir %{_libdir}/gtk-4.0/%{abivers}/media
+%endif
%dir %{_libdir}/gtk-4.0/%{abivers}/printbackends
%attr(755,root,root)
%{_libdir}/gtk-4.0/%{abivers}/printbackends/libprintbackend-file.so
%{_libdir}/girepository-1.0/Gdk-4.0.typelib
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk4.git/commitdiff/fddd72f26c6c7d2b3f52e6c889ffa82eb4bfe9c9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vlan] - empty debugsource, disable it
commit e99e0753a232ab14f8819a2b039fa0100d4e0b0c
Author: Marcin Krol
Date: Sat Dec 2 18:14:45 2023 +0100
- empty debugsource, disable it
vlan.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/vlan.spec b/vlan.spec
index 05ff431..f9144fd 100644
--- a/vlan.spec
+++ b/vlan.spec
@@ -19,6 +19,8 @@ Patch0: %{name}-format-security.patch
Obsoletes: vconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define_debugsource_packages 0
+
%define_sbindir/sbin
%description
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vlan.git/commitdiff/e99e0753a232ab14f8819a2b039fa0100d4e0b0c
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libpgm] - forgot to add patch
commit 0e2e9f7548df3dbbbafa162c2b0073887f0dc6d2 Author: Marcin Krol Date: Sat Dec 2 18:03:25 2023 +0100 - forgot to add patch python3.patch | 11 +++ 1 file changed, 11 insertions(+) --- diff --git a/python3.patch b/python3.patch new file mode 100644 index 000..a6e72a7 --- /dev/null +++ b/python3.patch @@ -0,0 +1,11 @@ +--- openpgm-release-5-3-128/openpgm/pgm/configure.ac 2020-08-31 05:14:09.0 +0200 openpgm-release-5-3-128/openpgm/pgm/configure.ac 2023-12-02 17:31:04.715055041 +0100 +@@ -30,7 +30,7 @@ + AM_PROG_AS + AC_PROG_LIBTOOL + AC_PATH_PROG(PERL, perl) +-AC_PATH_PROG(PYTHON, python) ++AC_PATH_PROG(PYTHON, python3) + + # nb: earliest verifiable version is 2.2. + m4_ifdef([LT_PREREQ], [LT_PREREQ([2.2])]) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libpgm.git/commitdiff/0e2e9f7548df3dbbbafa162c2b0073887f0dc6d2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libpgm] - switch to python3
commit f3dd64984151c0151f8798d08d11739dc497eae6
Author: Marcin Krol
Date: Sat Dec 2 17:33:39 2023 +0100
- switch to python3
libpgm.spec | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/libpgm.spec b/libpgm.spec
index 2381962..94d61e4 100644
--- a/libpgm.spec
+++ b/libpgm.spec
@@ -3,19 +3,20 @@ Summary(pl.UTF-8):Biblioteka wiarygodnego multicastowego
protokołu sieciowego
Name: libpgm
Version: 5.3.128
%definetagver %(echo %{version} | tr . -)
-Release: 1
+Release: 2
License: LGPL v2.1+
Group: Libraries
#Source0Download: https://github.com/steve-o/openpgm/releases
Source0:
https://github.com/steve-o/openpgm/archive/release-%{tagver}/openpgm-%{version}.tar.gz
# Source0-md5: 134eb021a8e4618ef87d54456282d186
Patch0:%{name}-inline.patch
+Patch1:python3.patch
URL: https://github.com/steve-o/openpgm
BuildRequires: autoconf >= 2.61
BuildRequires: automake >= 1:1.10
BuildRequires: libtool >= 2:2.2
BuildRequires: perl-base
-BuildRequires: python
+BuildRequires: python3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -53,6 +54,7 @@ Statyczna biblioteka OpenPGM.
%prep
%setup -q -n openpgm-release-%{tagver}
%patch0 -p1
+%patch1 -p1
%{__mv} openpgm/pgm/openpgm-{5.2,5.3}.pc.in
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libpgm.git/commitdiff/f3dd64984151c0151f8798d08d11739dc497eae6
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gpm] - rediffed
commit 80f4ae18635de18624d5134024e4814b606c47c2 Author: Marcin Krol Date: Sat Dec 2 17:21:25 2023 +0100 - rediffed glibc.patch | 99 ++- gpm-gawk.patch| 7 ++-- gpm-nodebug.patch | 16 + 3 files changed, 37 insertions(+), 85 deletions(-) --- diff --git a/glibc.patch b/glibc.patch index ad31e0b..d87fe3f 100644 --- a/glibc.patch +++ b/glibc.patch @@ -10,12 +10,14 @@ found. src/daemon/open_console.c | 4 1 file changed, 4 insertions(+) -diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c -index 4d6c0af..6dd43e6 100644 a/src/daemon/open_console.c -+++ b/src/daemon/open_console.c -@@ -24,6 +24,10 @@ - #include /* major() */ +diff -urNp -x '*.orig' gpm-1.20.7.org/src/daemon/open_console.c gpm-1.20.7/src/daemon/open_console.c +--- gpm-1.20.7.org/src/daemon/open_console.c 2012-10-26 23:21:38.0 +0200 gpm-1.20.7/src/daemon/open_console.c 2023-12-02 17:21:16.152842561 +0100 +@@ -21,8 +21,13 @@ + + #include /* open and co. */ + #include/* stat()*/ ++#include /* major() */ #include /* ioctl */ +#ifdef HAVE_SYS_SYSMACROS_H @@ -25,34 +27,9 @@ index 4d6c0af..6dd43e6 100644 /* Linux specific (to be outsourced in gpm2 */ #include/* for serial console check */ #include /* for serial console check */ -From d88fb1de5803c366ab62f7de9ee5d83207fb2afe Mon Sep 17 00:00:00 2001 -From: Dima Krasner -Date: Wed, 12 Nov 2014 23:06:46 +0200 -Subject: [PATCH] Added musl support to libgpm and the daemon. - - src/daemon/open_console.c | 1 + - src/prog/display-buttons.c | 1 + - src/prog/display-coords.c | 1 + - src/prog/gpm-root.y| 4 ++-- - 4 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c -index 98297c9..4d6c0af 100644 a/src/daemon/open_console.c -+++ b/src/daemon/open_console.c -@@ -21,6 +21,7 @@ - - #include /* open and co. */ - #include/* stat()*/ -+#include /* major() */ - #include /* ioctl */ - - /* Linux specific (to be outsourced in gpm2 */ -diff --git a/src/prog/display-buttons.c b/src/prog/display-buttons.c -index de8e5b2..38d2f11 100644 a/src/prog/display-buttons.c -+++ b/src/prog/display-buttons.c +diff -urNp -x '*.orig' gpm-1.20.7.org/src/prog/display-buttons.c gpm-1.20.7/src/prog/display-buttons.c +--- gpm-1.20.7.org/src/prog/display-buttons.c 2012-10-26 23:21:38.0 +0200 gpm-1.20.7/src/prog/display-buttons.c 2023-12-02 17:21:16.152842561 +0100 @@ -36,6 +36,7 @@ #include /* printf() */ #include /* time() */ @@ -61,11 +38,10 @@ index de8e5b2..38d2f11 100644 #include /* gpm information */ /* display resulting data */ -diff --git a/src/prog/display-coords.c b/src/prog/display-coords.c -index 1fb810f..82afd12 100644 a/src/prog/display-coords.c -+++ b/src/prog/display-coords.c -@@ -38,6 +38,7 @@ +diff -urNp -x '*.orig' gpm-1.20.7.org/src/prog/display-coords.c gpm-1.20.7/src/prog/display-coords.c +--- gpm-1.20.7.org/src/prog/display-coords.c 2012-10-26 23:21:38.0 +0200 gpm-1.20.7/src/prog/display-coords.c 2023-12-02 17:21:16.152842561 +0100 +@@ -37,6 +37,7 @@ #include /* printf() */ #include /* time() */ #include /* errno*/ @@ -73,48 +49,21 @@ index 1fb810f..82afd12 100644 #include /* gpm information */ /* display resulting data */ -diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y -index 069d801..188ae35 100644 a/src/prog/gpm-root.y -+++ b/src/prog/gpm-root.y -@@ -1199,9 +1199,9 @@ int main(int argc, char **argv) - #if defined(__GLIBC__) -__sigemptyset(_mask); - #else /* __GLIBC__ */ -- childaction.sa_mask=0; -+ sigemptyset(_mask); - #endif /* __GLIBC__ */ -- childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */ -+ childaction.sa_flags=0; -sigaction(SIGCHLD,,NULL); - -/*... Connect and get your buffer */ -From fdc42770596e25749f7e2ce0ea97882177397167 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 25 Jun 2017 07:25:33 -0700 -Subject: [PATCH] Use sigemptyset API instead of __sigemptyset - -__sigemptyset has been removed from glibc public -API headers in upcoming (2.26) release onwards - -Signed-off-by: Khem Raj - src/prog/gpm-root.y | 4 - 1 file changed, 4 deletions(-) - -diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y -index 5126c65..76c896c 100644 a/src/prog/gpm-root.y -+++ b/src/prog/gpm-root.y -@@ -1196,11 +1196,7 @@ int main(int argc, char **argv) +diff -urNp -x '*.orig'
[packages/libmng] - rediffed
commit c731be3572cad990ee1f4d56d2def3b22723400e Author: Marcin Krol Date: Sat Dec 2 17:01:43 2023 +0100 - rediffed libmng-automake.patch | 46 -- 1 file changed, 24 insertions(+), 22 deletions(-) --- diff --git a/libmng-automake.patch b/libmng-automake.patch index f680c09..6177007 100644 --- a/libmng-automake.patch +++ b/libmng-automake.patch @@ -1,7 +1,23 @@ libmng-1.0.10/makefiles/Makefile.am.orig 2004-09-18 09:39:43.0 +0200 -+++ libmng-1.0.10/makefiles/Makefile.am2007-07-16 19:43:07.285858201 +0200 -@@ -2,8 +2,10 @@ - +diff -urNp -x '*.orig' libmng-2.0.3.org/doc/makefiles/Makefile.am libmng-2.0.3/doc/makefiles/Makefile.am +--- libmng-2.0.3.org/doc/makefiles/Makefile.am 1970-01-01 01:00:00.0 +0100 libmng-2.0.3/doc/makefiles/Makefile.am 2023-12-02 16:59:44.254964159 +0100 +@@ -0,0 +1,4 @@ ++## Process this file with automake to produce Makefile.in ++ ++SUBDIRS = man ++ +diff -urNp -x '*.orig' libmng-2.0.3.org/doc/man/makefiles/Makefile.am libmng-2.0.3/doc/man/makefiles/Makefile.am +--- libmng-2.0.3.org/doc/man/makefiles/Makefile.am 1970-01-01 01:00:00.0 +0100 libmng-2.0.3/doc/man/makefiles/Makefile.am 2023-12-02 16:59:44.254964159 +0100 +@@ -0,0 +1,3 @@ ++## Process this file with automake to produce Makefile.in ++ ++man_MANS = libmng.3 jng.5 mng.5 +diff -urNp -x '*.orig' libmng-2.0.3.org/makefiles/Makefile.am libmng-2.0.3/makefiles/Makefile.am +--- libmng-2.0.3.org/makefiles/Makefile.am 2013-03-05 12:57:16.0 +0100 libmng-2.0.3/makefiles/Makefile.am 2023-12-02 16:59:44.254964159 +0100 +@@ -3,8 +3,10 @@ MAINTAINERCLEANFILES = Makefile.in + ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = 1.3 foreign no-dependencies +SUBDIRS = doc @@ -12,9 +28,10 @@ # libmng release @VERSION@ libmng-2.0.2/makefiles/configure.ac.orig 2014-02-04 18:36:36.404372468 +0100 -+++ libmng-2.0.2/makefiles/configure.ac2014-02-04 19:49:51.950854671 +0100 -@@ -250,6 +250,8 @@ +diff -urNp -x '*.orig' libmng-2.0.3.org/makefiles/configure.ac libmng-2.0.3/makefiles/configure.ac +--- libmng-2.0.3.org/makefiles/configure.ac2013-03-05 12:16:17.0 +0100 libmng-2.0.3/makefiles/configure.ac2023-12-02 16:59:44.254964159 +0100 +@@ -250,6 +250,8 @@ fi test $_restore -eq 1 && CPPFLAGS=$_cppflags LDFLAGS=$_ldflags AC_CONFIG_FILES([Makefile @@ -23,18 +40,3 @@ libmng.pc:libmng.pc.in ]) AC_OUTPUT -diff -Nru libmng-1.0.5.orig/doc/makefiles/Makefile.am libmng-1.0.5/doc/makefiles/Makefile.am libmng-1.0.5.orig/doc/makefiles/Makefile.amThu Jan 1 01:00:00 1970 -+++ libmng-1.0.5/doc/makefiles/Makefile.am Tue Mar 4 09:25:11 2003 -@@ -0,0 +1,4 @@ -+## Process this file with automake to produce Makefile.in -+ -+SUBDIRS = man -+ -diff -Nru libmng-1.0.5.orig/doc/man/makefiles/Makefile.am libmng-1.0.5/doc/man/makefiles/Makefile.am libmng-1.0.5.orig/doc/man/makefiles/Makefile.amThu Jan 1 01:00:00 1970 -+++ libmng-1.0.5/doc/man/makefiles/Makefile.am Tue Mar 4 09:25:11 2003 -@@ -0,0 +1,3 @@ -+## Process this file with automake to produce Makefile.in -+ -+man_MANS = libmng.3 jng.5 mng.5 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libmng.git/commitdiff/c731be3572cad990ee1f4d56d2def3b22723400e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
Re: [OT] The Fall of the British Empire???
bob bent, there have been a lot of prosperous nations in history that had no interest in conquest, Part’s of Britain’s were accidental—the East India Tea Company (yes, the same one that messed with the US) acquired India a bit at a time as its troops (yes, this corporation kept troops!) put down local disputes that interfered with trade. They spent a full century, iirc, trying to pawn it off on the crown before it was finally accepted! British English was never the *lingua franca*. American English suddenly took the role in the postwar period/vacuum. I suppose it was a natural result of the *Pax Americana.* I’m about halfway through Gibson’s *Decline and Fall of the Roman Empire.* (And haven’t moved much in the last decade, but anyway . . .). It’s much easier to read on an iPad from the Gutenberg project than the 5 pt text, or whatever is, in the printed version I have. ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: Can't codesign Mac app
jacqui juggled, So then I tried notarizationHelper V4 but keep getting "no identity found" errors. Ah. An identity crisis! :) ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: All Versions of LC crashing in Sonoma
bob bobbled, So for those upgrading to Sonoma, 9.6.10 and 10 dp6 are now a rubicon of sorts. There’s no going back. (I just needed to use the word Rubicon in a sentence today.) Shelly cahn’t speak with wi’out a New Ahngland oxcent, but Rubicon! Ok, I’ll call back under my rock ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: Forum Software LC?
bob belabored, The Russians had a great saying: There’s no such thing as a free lunch. True. But there *is* a lunch that someone else pays for . . . ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: Livecode and ESP32 microcontroler
Forty years ago, HyperCard and Supercars ran on 8 MHz, 16 bit, 68000s. (OK, it was a 16/32 design, but still). However, it was *not* snappy by any means. I suspect that you’d need a rather stripped down version of LiveCode on a microcontroller, both to get adequate performance and to cut power. But I’d definitely be interested. My next round of tinkering will probably be with a device like that, as the wifi or ble controller I attach to arduinos seem to have more than an arduino’s worth of processing power left. ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: Forum Software LC?
Bob blipped, Well, if I go to my bartender and ask for a free beer, I might get one, When I bought my last bicycle helmet (they’re single use, and the old one had a massive dent at the hairline. I’d never been to a trauma unit before . . .), there was a little sign on the counter that read, “ring bell for beer.” Amused, I rang the bell. And the salesman turned around, pulled a beer from a small refrigerator, and handed it to me! with that, I'll grab some popcorn and enjoy the license wars . . . ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: Merging PDF pages
richard reasoned be aware that you will lose one the most valuable things about a PDF document: the embedded text layer. Oh, no, there’s something more valuable, which you also lose: anything over 72 dpi! I played with a pdf library for python for a bit, as well as raw pdf, without much luck. ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
[packages/vde2] - switch to python3
commit d32f71a6492ea82ac8a817eeb698e1e884342697
Author: Marcin Krol
Date: Mon Jul 24 01:31:46 2023 +0200
- switch to python3
python3.patch | 21 +
vde2.spec | 22 --
2 files changed, 33 insertions(+), 10 deletions(-)
---
diff --git a/vde2.spec b/vde2.spec
index fdeb7f8..a17e3e4 100644
--- a/vde2.spec
+++ b/vde2.spec
@@ -2,7 +2,7 @@ Summary:VDE2: Virtual Distributed Ethernet
Summary(pl.UTF-8): VDE2: wirtualny rozproszony ethernet
Name: vde2
Version: 2.3.2
-Release: 6
+Release: 7
License: LGPL v2.1+ (libvdeplug), BSD (slirpvde), GPL v2+ (the rest)
Group: Networking/Utilities
Source0: http://downloads.sourceforge.net/vde/%{name}-%{version}.tar.bz2
@@ -10,13 +10,14 @@ Source0:
http://downloads.sourceforge.net/vde/%{name}-%{version}.tar.bz2
Patch0:%{name}-pathmax.patch
Patch1:%{name}-format.patch
Patch2:%{name}-openssl-1.1.patch
+Patch3:python3.patch
URL: http://sourceforge.net/projects/vde/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: libpcap-devel
BuildRequires: libtool
BuildRequires: openssl-devel
-BuildRequires: python-devel >= 1:2.5
+BuildRequires: python3-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
Requires: %{name}-libs = %{version}-%{release}
@@ -89,6 +90,7 @@ Pythonowy interfejs do VDE2.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
@@ -101,26 +103,25 @@ Pythonowy interfejs do VDE2.
--enable-kernel-switch
%{__make} -j1 \
- pythondir=%{py_sitedir}
+ pythondir=%{py3_sitedir}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- pythondir=%{py_sitedir}
+ pythondir=%{py3_sitedir}
# loadable modules
%{__rm} $RPM_BUILD_ROOT%{_libdir}/vde2/libvdetap.{la,a}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/vde2/vde_l3/*.la
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/vdeplug_python.la
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/vdeplug_python.la
# libs .la kept - no Requires/Libs.private
cp -p src/slirpvde/README README.slirpvde
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -226,5 +227,6 @@ rm -rf $RPM_BUILD_ROOT
%files -n python-vde2
%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/vdeplug_python.so
-%{py_sitedir}/VdePlug.py[co]
+%attr(755,root,root) %{py3_sitedir}/vdeplug_python.so
+%{py3_sitedir}/VdePlug.py
+%{py3_sitedir}/__pycache__/VdePlug.cpython-*.py[co]
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 000..31718bc
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,21 @@
+diff -ur vde2-2.3.2.orig/configure.ac vde2-2.3.2/configure.ac
+--- vde2-2.3.2.orig/configure.ac 2011-11-23 17:41:19.0 +0100
vde2-2.3.2/configure.ac2023-07-23 23:25:48.994431962 +0200
+@@ -192,7 +192,7 @@
+
+ if test x"$enable_python" = x"yes"; then
+ # check python
+- AM_PATH_PYTHON([2.5])
++ AM_PATH_PYTHON([3])
+ AC_PATH_PROG(PYTHON_CONFIG, python$PYTHON_VERSION-config)
+ if test x"$PYTHON_CONFIG" = x""; then
+ AC_PATH_PROG(PYTHON_CONFIG, python-config)
+diff -ur vde2-2.3.2.orig/src/lib/python/VdePlug.py
vde2-2.3.2/src/lib/python/VdePlug.py
+--- vde2-2.3.2.orig/src/lib/python/VdePlug.py 2011-11-23 17:41:17.0
+0100
vde2-2.3.2/src/lib/python/VdePlug.py 2023-07-23 23:38:52.517525533
+0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+
+ '''
+
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vde2.git/commitdiff/d32f71a6492ea82ac8a817eeb698e1e884342697
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libiscsi] - iscsi-test-cu BRs CUnit, explicitly build iscsi-test-cu and man pages
commit b1bc1c5bf12361f0651fba92657851975ea774c0
Author: Marcin Krol
Date: Sun Jul 23 22:35:37 2023 +0200
- iscsi-test-cu BRs CUnit, explicitly build iscsi-test-cu and man pages
libiscsi.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/libiscsi.spec b/libiscsi.spec
index 1ccbd4e..5d1fdb2 100644
--- a/libiscsi.spec
+++ b/libiscsi.spec
@@ -12,6 +12,7 @@ Patch0: %{name}-link.patch
URL: https://github.com/sahlberg/libiscsi
BuildRequires: autoconf >= 2.50
BuildRequires: automake
+BuildRequires: CUnit
BuildRequires: libgcrypt-devel
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
@@ -88,6 +89,8 @@ wszystkich celów oraz urządzeń.
%{__automake}
%configure \
CFLAGS="%{rpmcflags} -fcommon" \
+ --enable-man-pages \
+ --enable-test-tool \
--disable-werror
%{__make}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libiscsi.git/commitdiff/b1bc1c5bf12361f0651fba92657851975ea774c0
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/CUnit] - fix string format build errors
commit 2280744d20f0fc1d75d4b7e66b83046747296dc9
Author: Marcin Krol
Date: Sun Jul 23 21:42:31 2023 +0200
- fix string format build errors
CUnit.spec | 4 +++-
format.patch | 43 +++
2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/CUnit.spec b/CUnit.spec
index 1e92eda..de58eab 100644
--- a/CUnit.spec
+++ b/CUnit.spec
@@ -7,7 +7,7 @@ Summary:Automated testing framework for C
Summary(pl.UTF-8): Szkielet automatycznych testów dla C
Name: CUnit
Version: 2.1
-Release: 3
+Release: 4
License: LGPL v2+
Group: Development/Tools
Source0:
http://downloads.sourceforge.net/cunit/%{name}-%{version}-3.tar.bz2
@@ -15,6 +15,7 @@ Source0:
http://downloads.sourceforge.net/cunit/%{name}-%{version}-3.tar.bz2
Patch0:%{name}-curses.patch
Patch1:%{name}-libs.patch
Patch2:%{name}-FHS.patch
+Patch3:format.patch
URL: http://cunit.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
@@ -85,6 +86,7 @@ Przykłady do CUnita.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
diff --git a/format.patch b/format.patch
new file mode 100644
index 000..c5b944b
--- /dev/null
+++ b/format.patch
@@ -0,0 +1,43 @@
+diff -ur CUnit-2.1-3.orig/CUnit/Sources/Curses/Curses.c
CUnit-2.1-3/CUnit/Sources/Curses/Curses.c
+--- CUnit-2.1-3.orig/CUnit/Sources/Curses/Curses.c 2014-04-24
02:54:45.0 +0200
CUnit-2.1-3/CUnit/Sources/Curses/Curses.c 2023-07-23 21:37:18.730110415
+0200
+@@ -952,11 +952,11 @@
+
+ snprintf(szTemp, STRING_LENGTH, _("Commands: R - run all tests in suite
%s"),
+ pSuite->pName);
+- mvwprintw(details_pad.pPad, 0, 0, szTemp);
++ mvwprintw(details_pad.pPad, 0, 0, "%s", szTemp);
+ mvwprintw(details_pad.pPad, 1, 0, _(" S - Select and run a
test"));
+ snprintf(szTemp, STRING_LENGTH, _(" L - List all tests
registered in suite %s"),
+ pSuite->pName);
+- mvwprintw(details_pad.pPad, 2, 0, szTemp);
++ mvwprintw(details_pad.pPad, 2, 0, "%s", szTemp);
+ mvwprintw(details_pad.pPad, 3, 0, _(" A - Activate or deactivate
a test (toggle)"));
+ mvwprintw(details_pad.pPad, 4, 0, _(" F - Show failures from last
test run"));
+ mvwprintw(details_pad.pPad, 5, 0, _(" M - Move up to main menu"));
+@@ -1068,14 +1068,14 @@
+ }
+
+ snprintf(szTemp, STRING_LENGTH, "%s: %s", _("Suite"), pSuite->pName);
+- mvwprintw(details_pad.pPad, 0, 0, szTemp);
++ mvwprintw(details_pad.pPad, 0, 0, "%s", szTemp);
+
+ snprintf(szTemp, STRING_LENGTH,
+"%*s %-*s%*s",
+width[0], _("#"),
+width[1], _("Test Name"),
+width[2], _("Active?"));
+- mvwprintw(details_pad.pPad, 1, 0, szTemp);
++ mvwprintw(details_pad.pPad, 1, 0, "%s", szTemp);
+
+ for (i = 0, pCurTest = pSuite->pTest ;
+NULL != pCurTest ;
+@@ -1158,7 +1158,7 @@
+
+ snprintf(szTemp, STRING_LENGTH, _(" 1 - Inactive suites/tests treated
as runtime failures %s"),
+ (CU_FALSE != CU_get_fail_on_inactive())
? _("Yes") : _("No "));
+-mvwprintw(details_pad.pPad, 2, 0, szTemp);
++mvwprintw(details_pad.pPad, 2, 0, "%s", szTemp);
+ refresh_details_window();
+ read_input_string(_("Enter number of option to change : "), szTemp,
STRING_LENGTH);
+ option_num = atol(szTemp);
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/CUnit.git/commitdiff/2280744d20f0fc1d75d4b7e66b83046747296dc9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xen] - python fixes from upstream, force python3 shebang when building w/o python2
commit 17b06125959f526df3df3379c2b39a9377bca6a4
Author: Marcin Krol
Date: Sun Jul 23 21:33:29 2023 +0200
- python fixes from upstream, force python3 shebang when building w/o
python2
xen-init-list | 2 +-
xen.spec | 12
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/xen.spec b/xen.spec
index 50e9794..9a54909 100644
--- a/xen.spec
+++ b/xen.spec
@@ -45,7 +45,7 @@ Summary: Xen - a virtual machine monitor
Summary(pl.UTF-8): Xen - monitor maszyny wirtualnej
Name: xen
Version: 4.16.2
-Release: 1
+Release: 2
License: GPL v2, interface parts on BSD-like
Group: Applications/System
# for available versions see https://xenproject.org/xen-project-archives/
@@ -106,6 +106,7 @@ Patch16:ocaml-4.12.patch
Patch17: %{name}-golang-32bit.patch
Patch18: %{name}-gcc12.patch
Patch19: gcc13.patch
+Patch20: python-fixes.patch
URL: http://www.xen.org/products/xenhyp.html
BuildRequires: autoconf >= 2.67
%ifarch %{ix86} %{x8664}
@@ -442,6 +443,7 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z
firmware
%endif
%patch18 -p1
%patch19 -p1
+%patch20 -p1
# stubdom sources
ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom
@@ -451,11 +453,14 @@ ln -s %{SOURCE15} tools/firmware/etherboot/ipxe.tar.gz
%if %{with python2}
%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' \
%else
-%{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},' \
+%{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},;
1s,/usr/bin/python2$,%{__python3},' \
%endif
+ tools/misc/xencov_split \
+ tools/misc/xenpvnetboot \
tools/pygrub/src/pygrub \
tools/python/scripts/{convert-legacy-stream,verify-stream-v2} \
- tools/xenmon/xenmon.py
+ tools/xenmon/xenmon.py \
+ tools/xentrace/xentrace_format
# do not allow fetching anything via git
echo GIT=/bin/false >> Config.mk
@@ -702,7 +707,6 @@ fi
%attr(755,root,root) %{_bindir}/vchan-socket-proxy
%attr(755,root,root) %{_bindir}/xen-cpuid
%attr(755,root,root) %{_bindir}/xenalyze
-%attr(755,root,root) %{_bindir}/xencons
%attr(755,root,root) %{_bindir}/xencov_split
%attr(755,root,root) %{_bindir}/xentrace_format
%if %{with xsm}
diff --git a/xen-init-list b/xen-init-list
index e83b784..708eade 100755
--- a/xen-init-list
+++ b/xen-init-list
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
from __future__ import print_function
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/17b06125959f526df3df3379c2b39a9377bca6a4
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xen] - python fixes from upstream
commit aba95eec762c2d458c0d908597fa8535bc9f1a3c
Author: Marcin Krol
Date: Sun Jul 23 21:32:52 2023 +0200
- python fixes from upstream
python-fixes.patch | 1826
1 file changed, 1826 insertions(+)
---
diff --git a/python-fixes.patch b/python-fixes.patch
new file mode 100644
index 000..b5849be
--- /dev/null
+++ b/python-fixes.patch
@@ -0,0 +1,1826 @@
+diff -urN xen-4.16.2.orig/tools/misc/Makefile xen-4.16.2/tools/misc/Makefile
+--- xen-4.16.2.orig/tools/misc/Makefile2022-08-18 13:47:46.0
+0200
xen-4.16.2/tools/misc/Makefile 2023-07-23 20:27:26.104773461 +0200
+@@ -13,7 +13,6 @@
+ # Everything to be installed in regular bin/
+ INSTALL_BIN-$(CONFIG_X86) += xen-cpuid
+ INSTALL_BIN-$(CONFIG_X86) += xen-detect
+-INSTALL_BIN+= xencons
+ INSTALL_BIN+= xencov_split
+ INSTALL_BIN += $(INSTALL_BIN-y)
+
+@@ -45,7 +44,6 @@
+ TARGETS_ALL := $(INSTALL_BIN) $(INSTALL_SBIN) $(INSTALL_PRIVBIN)
+
+ # Everything which only needs copying to install
+-TARGETS_COPY += xencons
+ TARGETS_COPY += xencov_split
+ TARGETS_COPY += xenpvnetboot
+
+diff -urN xen-4.16.2.orig/tools/misc/xencons xen-4.16.2/tools/misc/xencons
+--- xen-4.16.2.orig/tools/misc/xencons 2023-07-23 20:27:00.747415202 +0200
xen-4.16.2/tools/misc/xencons 1970-01-01 01:00:00.0 +0100
+@@ -1,92 +0,0 @@
+-#!/usr/bin/python2
+-
+-##
+-# Console client for Xen guest OSes
+-# Copyright (c) 2004, K A Fraser
+-##
+-
+-import errno, os, signal, socket, struct, sys
+-
+-from termios import *
+-# Indexes into termios.tcgetattr() list.
+-IFLAG = 0
+-OFLAG = 1
+-CFLAG = 2
+-LFLAG = 3
+-ISPEED = 4
+-OSPEED = 5
+-CC = 6
+-
+-def __child_death(signum, frame):
+-global stop
+-stop = True
+-
+-def __recv_from_sock(sock):
+-global stop
+-stop = False
+-while not stop:
+-try:
+-data = sock.recv(1024)
+-except socket.error, error:
+-if error[0] != errno.EINTR:
+-raise
+-else:
+-try:
+-os.write(1, data)
+-except os.error, error:
+-if error[0] != errno.EINTR:
+-raise
+-os.wait()
+-
+-def __send_to_sock(sock):
+-while 1:
+-try:
+-data = os.read(0,1024)
+-except os.error, error:
+-if error[0] != errno.EINTR:
+-raise
+-else:
+-if ord(data[0]) == ord(']')-64:
+-break
+-try:
+-sock.send(data)
+-except socket.error, error:
+-if error[0] == errno.EPIPE:
+-sys.exit(0)
+-if error[0] != errno.EINTR:
+-raise
+-sys.exit(0)
+-
+-def connect(host,port):
+-sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0)
+-sock.connect((host,port))
+-
+-oattrs = tcgetattr(0)
+-nattrs = tcgetattr(0)
+-nattrs[IFLAG] = nattrs[IFLAG] & ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON)
+-nattrs[OFLAG] = nattrs[OFLAG] & ~(OPOST)
+-nattrs[CFLAG] = nattrs[CFLAG] & ~(CSIZE | PARENB)
+-nattrs[CFLAG] = nattrs[CFLAG] | CS8
+-nattrs[LFLAG] = nattrs[LFLAG] & ~(ECHO | ICANON | IEXTEN | ISIG)
+-nattrs[CC][VMIN] = 1
+-nattrs[CC][VTIME] = 0
+-
+-if os.fork():
+-signal.signal(signal.SIGCHLD, __child_death)
+-print " REMOTE CONSOLE: CTRL-] TO QUIT "
+-tcsetattr(0, TCSAFLUSH, nattrs)
+-try:
+-__recv_from_sock(sock)
+-finally:
+-tcsetattr(0, TCSAFLUSH, oattrs)
+-print
+-print " REMOTE CONSOLE EXITED *"
+-else:
+-signal.signal(signal.SIGPIPE, signal.SIG_IGN)
+-__send_to_sock(sock)
+-
+-if __name__ == '__main__':
+-if len(sys.argv) != 3:
+-print sys.argv[0] + " "
+-sys.exit(1)
+-connect(str(sys.argv[1]),int(sys.argv[2]))
+diff -urN xen-4.16.2.orig/tools/misc/xencov_split
xen-4.16.2/tools/misc/xencov_split
+--- xen-4.16.2.orig/tools/misc/xencov_split2023-07-23 20:27:00.747415202
+0200
xen-4.16.2/tools/misc/xencov_split 2023-07-23 20:27:33.481877687 +0200
+@@ -94,4 +94,3 @@
+ sys.exit(1)
+ except KeyboardInterrupt:
+ sys.exit(1)
+-
+diff -urN xen-4.16.2.orig/tools/pygrub/Makefile
xen-4.16.2/tools/pygrub/Makefile
+--- xen-4.16.2.orig/tools/pygrub/Makefile 2022-08-18 13:47:46.0
+0200
xen-4.16.2/tools/pygrub/Makefile 2023-07-23 20:27:33.481877687 +0200
+@@ -6,19 +6,22 @@
+ PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
+ INSTALL_LOG = build/installed_files.txt
+
++setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)"
LDFLAGS="$(PY_LDFLAGS)" \
++ $(PYTHON) setup.py
++
+ .PHONY: all
+ all: build
+ .PHONY: build
+ build:
+-
[packages/CUnit] - rediffed
commit 82dfa258929739576f8826a4349a7fb871f6f654
Author: Marcin Krol
Date: Sun Jul 23 15:07:08 2023 +0200
- rediffed
CUnit-FHS.patch| 83 +-
CUnit-curses.patch | 5 ++--
CUnit-libs.patch | 70 -
3 files changed, 86 insertions(+), 72 deletions(-)
---
diff --git a/CUnit-FHS.patch b/CUnit-FHS.patch
index 5d1df41..3e404aa 100644
--- a/CUnit-FHS.patch
+++ b/CUnit-FHS.patch
@@ -1,28 +1,18 @@
CUnit-2.1-2/doc/headers/Makefile.am.orig 2010-10-14 11:22:01.0
+0200
-+++ CUnit-2.1-2/doc/headers/Makefile.am2013-10-15 20:29:25.894114411
+0200
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
-
--dochdrdir = $(prefix)/doc/@PACKAGE@/headers
-+dochdrdir = $(datarootdir)/doc/@PACKAGE@/headers
-
- INCLUDE_FILES = \
- Automated.h \
CUnit-2.1-2/doc/Makefile.am.orig 2006-03-21 02:30:57.0 +0100
-+++ CUnit-2.1-2/doc/Makefile.am2013-10-15 20:29:02.207448739 +0200
-@@ -1,8 +1,8 @@
- ## Process this file with automake to produce Makefile.in
+diff -urNp -x '*.orig' CUnit-2.1-3.org/CUnit/Sources/Test/Makefile.am
CUnit-2.1-3/CUnit/Sources/Test/Makefile.am
+--- CUnit-2.1-3.org/CUnit/Sources/Test/Makefile.am 2023-07-23
15:06:33.863438862 +0200
CUnit-2.1-3/CUnit/Sources/Test/Makefile.am 2023-07-23 15:06:33.980440529
+0200
+@@ -2,7 +2,7 @@
--docdir = $(prefix)/doc/@PACKAGE@
-+pkgdocdir = $(datarootdir)/doc/@PACKAGE@
+ if ENABLE_TEST
+ AM_CPPFLAGS = -I$(top_srcdir)/CUnit/Headers
+-testdir=${datadir}/@PACKAGE@/Test
++testdir=$(pkglibexecdir)/Test
--doc_DATA = \
-+pkgdoc_DATA = \
- CUnit_doc.css \
- error_handling.html \
- fdl.html \
CUnit-2.1-2/Examples/AutomatedTest/Makefile.am.orig2013-10-15
20:25:15.024124939 +0200
-+++ CUnit-2.1-2/Examples/AutomatedTest/Makefile.am 2013-10-15
20:33:42.807436964 +0200
+ test_PROGRAMS = test_cunit
+ test_cunit_SOURCES = test_cunit.c
+diff -urNp -x '*.orig' CUnit-2.1-3.org/Examples/AutomatedTest/Makefile.am
CUnit-2.1-3/Examples/AutomatedTest/Makefile.am
+--- CUnit-2.1-3.org/Examples/AutomatedTest/Makefile.am 2023-07-23
15:06:33.862438848 +0200
CUnit-2.1-3/Examples/AutomatedTest/Makefile.am 2023-07-23
15:06:33.979440515 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -31,8 +21,9 @@
if ENABLE_EXAMPLES
if ENABLE_AUTOMATED
CUnit-2.1-2/Examples/BasicTest/Makefile.am.orig2013-10-15
20:25:15.027458272 +0200
-+++ CUnit-2.1-2/Examples/BasicTest/Makefile.am 2013-10-15 20:34:01.270769520
+0200
+diff -urNp -x '*.orig' CUnit-2.1-3.org/Examples/BasicTest/Makefile.am
CUnit-2.1-3/Examples/BasicTest/Makefile.am
+--- CUnit-2.1-3.org/Examples/BasicTest/Makefile.am 2023-07-23
15:06:33.863438862 +0200
CUnit-2.1-3/Examples/BasicTest/Makefile.am 2023-07-23 15:06:33.979440515
+0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -41,8 +32,9 @@
if ENABLE_EXAMPLES
if ENABLE_BASIC
CUnit-2.1-2/Examples/ConsoleTest/Makefile.am.orig 2013-10-15
20:25:15.027458272 +0200
-+++ CUnit-2.1-2/Examples/ConsoleTest/Makefile.am 2013-10-15
20:34:19.040768775 +0200
+diff -urNp -x '*.orig' CUnit-2.1-3.org/Examples/ConsoleTest/Makefile.am
CUnit-2.1-3/Examples/ConsoleTest/Makefile.am
+--- CUnit-2.1-3.org/Examples/ConsoleTest/Makefile.am 2023-07-23
15:06:33.863438862 +0200
CUnit-2.1-3/Examples/ConsoleTest/Makefile.am 2023-07-23
15:06:33.979440515 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -51,8 +43,9 @@
if ENABLE_EXAMPLES
if ENABLE_CONSOLE
CUnit-2.1-2/Examples/CursesTest/Makefile.am.orig 2013-10-15
20:25:15.027458272 +0200
-+++ CUnit-2.1-2/Examples/CursesTest/Makefile.am2013-10-15
20:34:37.674101327 +0200
+diff -urNp -x '*.orig' CUnit-2.1-3.org/Examples/CursesTest/Makefile.am
CUnit-2.1-3/Examples/CursesTest/Makefile.am
+--- CUnit-2.1-3.org/Examples/CursesTest/Makefile.am2023-07-23
15:06:33.863438862 +0200
CUnit-2.1-3/Examples/CursesTest/Makefile.am2023-07-23
15:06:33.980440529 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
@@ -61,14 +54,28 @@
if ENABLE_EXAMPLES
if ENABLE_CURSES
CUnit-2.1-3/CUnit/Sources/Test/Makefile.am.orig2018-04-14
20:13:35.236957272 +0200
-+++ CUnit-2.1-3/CUnit/Sources/Test/Makefile.am 2018-04-14 20:16:47.150288418
+0200
-@@ -2,7 +2,7 @@
+diff -urNp -x '*.orig' CUnit-2.1-3.org/doc/Makefile.am
CUnit-2.1-3/doc/Makefile.am
+--- CUnit-2.1-3.org/doc/Makefile.am2014-04-24 02:54:45.0 +0200
CUnit-2.1-3/doc/Makefile.am2023-07-23 15:06:33.979440515 +0200
+@@ -1,8 +1,8 @@
+ ## Process this file with automake to produce Makefile.in
- if ENABLE_TEST
- AM_CPPFLAGS = -I$(top_srcdir)/CUnit/Headers
--testdir=${datadir}/@PACKAGE@/Test
-+testdir=$(pkglibexecdir)/Test
+-docdir =
[packages/bluez] - allow building without systemd
commit d63e2873c84fb6bb1a2402344ff486d7b75649ea
Author: Marcin Krol
Date: Sun Jul 23 14:42:06 2023 +0200
- allow building without systemd
bluez.spec | 12
1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/bluez.spec b/bluez.spec
index 863d24f..9989d1d 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -4,6 +4,7 @@
#
# Conditional build:
%bcond_without deprecated # deprecated tools
(ciptool,hciattach,hciconfig,hcidump,hcitool,rfcomm,sdptool)
+%bcond_without systemd # systemd
#
Summary: Bluetooth utilities
Summary(pl.UTF-8): Narzędzia Bluetooth
@@ -39,7 +40,7 @@ BuildRequires:pkgconfig >= 1:0.9.0
BuildRequires: readline-devel
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 2.011
-BuildRequires: systemd-devel
+%{?with_systemd:BuildRequires: systemd-devel}
BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel >= 1:172
BuildRequires: xz
@@ -210,8 +211,9 @@ aplikacji Bluetooth.
--enable-sixaxis \
--enable-static \
--with-udevdir=%{udevdir} \
- --with-systemdsystemunitdir=%{systemdunitdir} \
- --with-systemduserunitdir=%{systemduserunitdir}
+ %{?with_systemd:--with-systemdsystemunitdir=%{systemdunitdir}} \
+ %{?with_systemd:--with-systemduserunitdir=%{systemduserunitdir}} \
+ %{!?with_systemd:--disable-systemd}
%{__make} \
cupsdir=%{cupsdir}
@@ -235,7 +237,7 @@ install profiles/network/*.conf
$RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
#serial port connected Broadcom HCIs scripts
install %{SOURCE3} $RPM_BUILD_ROOT%{udevdir}/rules.d
-install %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}
+%{?with_systemd:install %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}}
install %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/bluetooth
# Install the HCI emulator, useful for testing
@@ -318,6 +320,7 @@ fi
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/sysconfig/bluetooth
%config(noreplace) %verify(not md5 mtime size)
/etc/dbus-1/system.d/bluetooth.conf
%config(noreplace) %verify(not md5 mtime size)
/etc/dbus-1/system.d/bluetooth-mesh.conf
+%if %{with systemd}
%{systemdunitdir}/bluetooth.service
%{systemdunitdir}/bluetooth-mesh.service
%{systemdunitdir}/btattach-bcm@.service
@@ -325,6 +328,7 @@ fi
%{_datadir}/dbus-1/services/org.bluez.obex.service
%{_datadir}/dbus-1/system-services/org.bluez.service
%{_datadir}/dbus-1/system-services/org.bluez.mesh.service
+%endif
%attr(755,root,root) %{udevdir}/hid2hci
%{udevdir}/rules.d/69-btattach-bcm.rules
%{udevdir}/rules.d/97-hid2hci.rules
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/bluez.git/commitdiff/d63e2873c84fb6bb1a2402344ff486d7b75649ea
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/GConf2] - python3 patch from Debian
commit a0582b5de8ee13fb804a640859cfde171075a59e
Author: Marcin Krol
Date: Sun Jul 23 14:16:00 2023 +0200
- python3 patch from Debian
GConf2.spec | 6 +++---
python3.patch | 56
2 files changed, 59 insertions(+), 3 deletions(-)
---
diff --git a/GConf2.spec b/GConf2.spec
index 08db914..3aba1d8 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -11,7 +11,7 @@ Summary(pt_BR.UTF-8): Sistema de Configuração do GNOME 2
Summary(ru.UTF-8): Система конфигурации GNOME 2
Name: GConf2
Version: 3.2.6
-Release: 7
+Release: 8
License: LGPL v2+
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.xz
@@ -19,6 +19,7 @@ Source0:
http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.x
Patch0:%{name}-NO_MAJOR_VERSION.patch
Patch1:%{name}-reload.patch
Patch2:workaround-crash.patch
+Patch3:python3.patch
URL: https://projects-old.gnome.org/gconf/
BuildRequires: ORBit2-devel >= 1:2.14.9
BuildRequires: autoconf >= 2.60
@@ -174,8 +175,7 @@ automatycznie skonfigurowane do używania tych adresów.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-
-%{__sed} -i -e '1s,/usr/bin/env python,%{__python},'
gsettings/gsettings-schema-convert
+%patch3 -p1
%build
%{?with_apidocs:%{__gtkdocize}}
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 000..49afea8
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,56 @@
+diff -ur GConf-3.2.6.orig/gsettings/gsettings-schema-convert
GConf-3.2.6/gsettings/gsettings-schema-convert
+--- GConf-3.2.6.orig/gsettings/gsettings-schema-convert2012-04-10
01:58:44.0 +0200
GConf-3.2.6/gsettings/gsettings-schema-convert 2023-07-23
13:55:53.263588352 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # vim: set ts=4 sw=4 et: coding=UTF-8
+ #
+ # Copyright (c) 2010, Novell, Inc.
+@@ -603,7 +603,7 @@
+ for line in lines:
+ current_line_nb += 1
+ self.parse_line(line)
+-except GSettingsSchemaConvertException, e:
++except GSettingsSchemaConvertException as e:
+ raise GSettingsSchemaConvertException('%s:%s: %s' %
(os.path.basename(self.file), current_line_nb, e))
+
+ return self.root
+@@ -1095,7 +1095,7 @@
+ try:
+ parser = GConfSchemaParser(argfile, options.gettext_domain,
options.schema_id, options.keep_underscores)
+ schema_root = parser.parse()
+-except SyntaxError, e:
++except SyntaxError as e:
+ raise GSettingsSchemaConvertException('\'%s\' does not look
like a valid gconf schema file: %s' % (argfile, e))
+ else:
+ # autodetect if file is XML or not
+@@ -1104,7 +1104,7 @@
+ schema_root = parser.parse()
+ if not options.simple and not options.xml:
+ options.simple = True
+-except SyntaxError, e:
++except SyntaxError as e:
+ parser = SimpleSchemaParser(argfile)
+ schema_root = parser.parse()
+ if not options.simple and not options.xml:
+@@ -1124,16 +1124,16 @@
+ sys.stdout.write(output)
+ else:
+ try:
+-fout = open(options.output, 'w')
++fout = open(options.output, 'wb')
+ fout.write(output)
+ fout.close()
+-except GSettingsSchemaConvertException, e:
++except GSettingsSchemaConvertException as e:
+ fout.close()
+ if os.path.exists(options.output):
+ os.unlink(options.output)
+ raise e
+
+-except GSettingsSchemaConvertException, e:
++except GSettingsSchemaConvertException as e:
+ print >> sys.stderr, '%s' % e
+ return 1
+
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/GConf2.git/commitdiff/a0582b5de8ee13fb804a640859cfde171075a59e
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/tix] - rediffed
commit 1d5a0c1afd1b125c155828b04c073e87d864fb15
Author: Marcin Krol
Date: Sun Jul 23 13:36:12 2023 +0200
- rediffed
fixInterpResult.patch | 33 +++--
tix-scriptpaths.patch | 7 ---
2 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/fixInterpResult.patch b/fixInterpResult.patch
index 21179dd..3ae40cc 100644
--- a/fixInterpResult.patch
+++ b/fixInterpResult.patch
@@ -1,7 +1,8 @@
Index: tix-8.4.3/PyTix-2.0/2.0/_tkinter.c
===
tix-8.4.3.orig/PyTix-2.0/2.0/_tkinter.c
-+++ tix-8.4.3/PyTix-2.0/2.0/_tkinter.c
+diff -urNp -x '*.orig' Tix8.4.3.org/PyTix-2.0/2.0/_tkinter.c
Tix8.4.3/PyTix-2.0/2.0/_tkinter.c
+--- Tix8.4.3.org/PyTix-2.0/2.0/_tkinter.c 2000-11-22 08:59:38.0
+0100
Tix8.4.3/PyTix-2.0/2.0/_tkinter.c 2023-07-23 13:34:43.723720858 +0200
@@ -41,6 +41,7 @@ Copyright (C) 1994 Steen Lumholt.
#define MAC_TCL
#endif
@@ -10,10 +11,9 @@ Index: tix-8.4.3/PyTix-2.0/2.0/_tkinter.c
#include
#include
#ifdef WITH_TIX
-Index: tix-8.4.3/PyTix-2.0/2.0/tkappinit.c
-===
tix-8.4.3.orig/PyTix-2.0/2.0/tkappinit.c
-+++ tix-8.4.3/PyTix-2.0/2.0/tkappinit.c
+diff -urNp -x '*.orig' Tix8.4.3.org/PyTix-2.0/2.0/tkappinit.c
Tix8.4.3/PyTix-2.0/2.0/tkappinit.c
+--- Tix8.4.3.org/PyTix-2.0/2.0/tkappinit.c 2000-11-22 08:59:51.0
+0100
Tix8.4.3/PyTix-2.0/2.0/tkappinit.c 2023-07-23 13:34:43.723720858 +0200
@@ -12,6 +12,7 @@
it explicitly, e.g. tkapp.eval("load {} Blt").
*/
@@ -22,10 +22,9 @@ Index: tix-8.4.3/PyTix-2.0/2.0/tkappinit.c
#include
#include
-Index: tix-8.4.3/generic/tix.h
-===
tix-8.4.3.orig/generic/tix.h
-+++ tix-8.4.3/generic/tix.h
+diff -urNp -x '*.orig' Tix8.4.3.org/generic/tix.h Tix8.4.3/generic/tix.h
+--- Tix8.4.3.org/generic/tix.h 2008-02-28 05:35:16.0 +0100
Tix8.4.3/generic/tix.h 2023-07-23 13:34:43.723720858 +0200
@@ -27,6 +27,7 @@ extern "C" {
#endif
@@ -34,10 +33,9 @@ Index: tix-8.4.3/generic/tix.h
#include
#endif
-Index: tix-8.4.3/generic/tixPort.h
-===
tix-8.4.3.orig/generic/tixPort.h
-+++ tix-8.4.3/generic/tixPort.h
+diff -urNp -x '*.orig' Tix8.4.3.org/generic/tixPort.h
Tix8.4.3/generic/tixPort.h
+--- Tix8.4.3.org/generic/tixPort.h 2005-03-25 21:15:53.0 +0100
Tix8.4.3/generic/tixPort.h 2023-07-23 13:34:43.723720858 +0200
@@ -19,6 +19,7 @@
#define _TIX_PORT_H_
@@ -46,10 +44,9 @@ Index: tix-8.4.3/generic/tixPort.h
#include "tcl.h"
#endif
-Index: tix-8.4.3/generic/tixUtils.c
-===
tix-8.4.3.orig/generic/tixUtils.c
-+++ tix-8.4.3/generic/tixUtils.c
+diff -urNp -x '*.orig' Tix8.4.3.org/generic/tixUtils.c
Tix8.4.3/generic/tixUtils.c
+--- Tix8.4.3.org/generic/tixUtils.c2008-02-28 05:29:17.0 +0100
Tix8.4.3/generic/tixUtils.c2023-07-23 13:34:43.723720858 +0200
@@ -13,6 +13,7 @@
* $Id: tixUtils.c,v 1.13 2008/02/28 04:29:17 hobbs Exp $
*/
diff --git a/tix-scriptpaths.patch b/tix-scriptpaths.patch
index 482774a..a60bae7 100644
--- a/tix-scriptpaths.patch
+++ b/tix-scriptpaths.patch
@@ -1,8 +1,9 @@
tix-8.1.3/library/bitmaps/mktransgif.tcl.orig Wed May 17 13:08:46 2000
-+++ tix-8.1.3/library/bitmaps/mktransgif.tcl Wed Feb 6 11:17:20 2002
+diff -urNp -x '*.orig' Tix8.4.3.org/library/bitmaps/mktransgif.tcl
Tix8.4.3/library/bitmaps/mktransgif.tcl
+--- Tix8.4.3.org/library/bitmaps/mktransgif.tcl2000-05-17
13:08:46.0 +0200
Tix8.4.3/library/bitmaps/mktransgif.tcl2023-07-23 13:34:43.500717719
+0200
@@ -1,7 +1,7 @@
#
- # $Id$
+ # $Id: mktransgif.tcl,v 1.1.1.1 2000/05/17 11:08:46 idiscovery Exp $
#
-#!/usr/local/bin/tclsh
+#!/usr/bin/tclsh
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tix.git/commitdiff/1d5a0c1afd1b125c155828b04c073e87d864fb15
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gtk4] - restored meson build without --reconfigure
commit 4b3d2432760058ff4d7f7bd8357cd72ea0bfde02
Author: Marcin Krol
Date: Sat Jul 22 22:35:37 2023 +0200
- restored meson build without --reconfigure
gtk4.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gtk4.spec b/gtk4.spec
index 8023f55..7a01400 100644
--- a/gtk4.spec
+++ b/gtk4.spec
@@ -356,7 +356,7 @@ Moduł GTK do drukowania przez CUPS.
%{__sed} -i -e "/^docs_dir =/ s,gtk_datadir / 'doc','%{_gtkdocdir}',"
docs/reference/meson.build
%build
-%meson --reconfigure build \
+%meson build \
%{?with_broadway:-Dbroadway-backend=true} \
%{?with_cloudproviders:-Dcloudproviders=enabled} \
-Dcolord=enabled \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk4.git/commitdiff/4b3d2432760058ff4d7f7bd8357cd72ea0bfde02
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/vte] - allow building without systemd
commit d497ddfba21b372a8990842fcdbdfec7eb84d303
Author: Marcin Krol
Date: Sat Jul 22 20:37:29 2023 +0200
- allow building without systemd
vte.spec | 12
1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/vte.spec b/vte.spec
index 4457466..c591175 100644
--- a/vte.spec
+++ b/vte.spec
@@ -3,6 +3,7 @@
%bcond_without apidocs # API documentation
%bcond_without glade # Glade catalog
%bcond_without gtk4# GTK+ 4 based library
+%bcond_without systemd # systemd
Summary: VTE terminal widget library
Summary(pl.UTF-8): Biblioteka z kontrolką terminala VTE
@@ -42,7 +43,7 @@ BuildRequires:pcre2-8-devel >= 10.21
BuildRequires: pkgconfig
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 1.752
-BuildRequires: systemd-devel >= 1:220
+%{?with_systemd:BuildRequires: systemd-devel >= 1:220}
BuildRequires: tar >= 1:1.22
BuildRequires: vala >= 2:0.24
BuildRequires: xz
@@ -53,7 +54,7 @@ Requires: gnutls >= 3.2.7
Requires: gtk+3 >= 3.24.0
Requires: libicu >= 4.8
Requires: pango >= 1:1.22.0
-Requires: systemd-libs >= 1:220
+%{?with_systemd:Requires: systemd-libs >= 1:220}
Obsoletes: vte-common < 0.42.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -134,7 +135,7 @@ Requires: gnutls >= 3.2.7
Requires: gtk4 >= 4.0.1
Requires: libicu >= 4.8
Requires: pango >= 1:1.22.0
-Requires: systemd-libs >= 1:220
+%{?with_systemd:Requires: systemd-libs >= 1:220}
# for common files
Suggests: %{name} = %{version}-%{release}
@@ -205,7 +206,8 @@ Dokumentacja API VTE (wersja dla GTK 4).
%{?with_apidocs:-Ddocs=true} \
%{!?with_glade:-Dglade=false} \
-Dgtk3=true \
- -Dgtk4=%{__true_false gtk4}
+ -Dgtk4=%{__true_false gtk4} \
+ %{!?with_systemd:-D_systemd=false} \
%ninja_build -C build
@@ -242,8 +244,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/girepository-1.0/Vte-2.91.typelib
%config(noreplace) %verify(not md5 mtime size) /etc/profile.d/vte.csh
%config(noreplace) %verify(not md5 mtime size) /etc/profile.d/vte.sh
+%if %{with systemd}
%dir %{systemduserunitdir}/vte-spawn-.scope.d
%{systemduserunitdir}/vte-spawn-.scope.d/defaults.conf
+%endif
%files devel
%defattr(644,root,root,755)
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vte.git/commitdiff/d497ddfba21b372a8990842fcdbdfec7eb84d303
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/spice-space] - switch to python 3.x
commit 687edfb2fd8e7b0bdc29031e8718b56fce2eb855
Author: Marcin Krol
Date: Sat Jul 22 16:26:03 2023 +0200
- switch to python 3.x
python3.patch| 27 +++
spice-space.spec | 8 +---
2 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/spice-space.spec b/spice-space.spec
index 99224cc..e650853 100644
--- a/spice-space.spec
+++ b/spice-space.spec
@@ -14,6 +14,7 @@ License: LGPL v2.1+
Group: Applications/Emulators
Source0:
https://www.spice-space.org/download/releases/spice-server/spice-%{version}.tar.bz2
# Source0-md5: 1de1e9157a1e2396884017978e7cf086
+Patch0:python3.patch
URL: https://www.spice-space.org/
%{?with_opengl:BuildRequires: OpenGL-GLU-devel}
%{?with_opengl:BuildRequires: OpenGL-devel}
@@ -38,9 +39,9 @@ BuildRequires:opus-devel >= 1.0.0
BuildRequires: orc-devel >= 0.4
BuildRequires: pixman-devel >= 0.17.7
BuildRequires: pkgconfig
-BuildRequires: python >= 2
-BuildRequires: python-pyparsing
-BuildRequires: python-six
+BuildRequires: python3
+BuildRequires: python3-pyparsing
+BuildRequires: python3-six
BuildRequires: rpmbuild(macros) >= 1.527
BuildRequires: spice-protocol >= 0.14.3
BuildRequires: xorg-lib-libX11-devel
@@ -115,6 +116,7 @@ Statyczna biblioteka serwera SPICE.
%prep
%setup -q -n spice-%{version}
+%patch0 -p1
%build
%{__libtoolize}
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 000..c0fcf77
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,27 @@
+diff -ur spice-0.15.2.orig/subprojects/spice-common/m4/spice-deps.m4
spice-0.15.2/subprojects/spice-common/m4/spice-deps.m4
+--- spice-0.15.2.orig/subprojects/spice-common/m4/spice-deps.m4
2023-05-12 10:37:16.0 +0200
spice-0.15.2/subprojects/spice-common/m4/spice-deps.m4 2023-07-22
16:21:54.669050493 +0200
+@@ -152,22 +152,14 @@
+[enable_python_checks="no"])
+ if test "x$enable_python_checks" != "xno"; then
+ AS_IF([test -n "$PYTHON"], # already set required PYTHON version
+- [AM_PATH_PYTHON
+- AX_PYTHON_MODULE([six], [1])
+- AX_PYTHON_MODULE([pyparsing], [1])],
+ [PYTHON=python3
+AX_PYTHON_MODULE([six])
+AX_PYTHON_MODULE([pyparsing])
+test "$HAVE_PYMOD_SIX" = "yes" && test "$HAVE_PYMOD_PYPARSING"
= "yes"],
+ [AM_PATH_PYTHON([3])],
+- [PYTHON=python2
+- AX_PYTHON_MODULE([six])
+- AX_PYTHON_MODULE([pyparsing])
+- test "$HAVE_PYMOD_SIX" = "yes" && test "$HAVE_PYMOD_PYPARSING"
= "yes"],
+- [AM_PATH_PYTHON([2])],
+ [AC_MSG_ERROR([Python modules six and pyparsing are required])])
+ else
+-AM_PATH_PYTHON
++AM_PATH_PYTHON([3])
+ fi
+ ])
+
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/spice-space.git/commitdiff/687edfb2fd8e7b0bdc29031e8718b56fce2eb855
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/SDL2] - allow building without pipewire
commit c574ca6fb2612f32955dd861b94962412937040e
Author: Marcin Krol
Date: Sat Jul 22 15:45:49 2023 +0200
- allow building without pipewire
SDL2.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/SDL2.spec b/SDL2.spec
index a4e4deb..08ca7f1 100644
--- a/SDL2.spec
+++ b/SDL2.spec
@@ -9,6 +9,7 @@
%bcond_without opengl # OpenGL (GLX) support
%bcond_without gles# OpenGL ES (EGL) support
%bcond_withkms # KMS/DRM graphics support
+%bcond_without pipewire# Pipewire audio support
%bcond_without vulkan # Vulkan graphics support
%bcond_without wayland # Wayland graphics support
%bcond_without fcitx # Fcitx IM support
@@ -92,7 +93,7 @@ BuildRequires:libsamplerate-devel
BuildRequires: libtool >= 2:2.0
%{?with_nas:BuildRequires: nas-devel}
BuildRequires: perl-modules
-BuildRequires: pipewire-devel >= 0.3.20
+%{?with_pipewire:BuildRequires:pipewire-devel >= 0.3.20}
BuildRequires: pkgconfig >= 1:0.7
BuildRequires: pulseaudio-devel >= 0.9
BuildRequires: rpm-build >= 4.6
@@ -230,6 +231,7 @@ SDL - przykładowe programy.
%{!?with_jack:--disable-jack} \
%{!?with_mmx:--disable-mmx} \
%{!?with_nas:--disable-nas} \
+ %{!?with_pipewire:--disable-pipewire} \
--enable-pthreads \
--enable-pthread-sem \
--disable-rpath \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/SDL2.git/commitdiff/c574ca6fb2612f32955dd861b94962412937040e
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/multipath-tools] - allow building on systems without systemd
commit ad89da5455c9c84f10db6d83c4043d0ac8564952
Author: Marcin Krol
Date: Sat Jul 22 15:35:44 2023 +0200
- allow building on systems without systemd
multipath-tools.spec | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 1e75d40..b6d024d 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -1,6 +1,7 @@
#
# Conditional build:
%bcond_withinitrd # build initrd version (very broken)
+%bcond_withsystemd # systemd
Summary: Tools to manage multipathed devices with the device-mapper
Summary(pl.UTF-8): Implementacja wielotrasowego dostępu do zasobów przy
użyciu device-mappera
@@ -32,7 +33,7 @@ BuildRequires:pkgconfig
BuildRequires: readline-devel
BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: sed >= 4.0
-BuildRequires: systemd-devel >= 1:209
+%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
BuildRequires: udev-devel
BuildRequires: userspace-rcu-devel
%if %{with initrd}
@@ -210,8 +211,10 @@ fi
/lib/udev/rules.d/56-multipath.rules
# TODO: package for systemd?
#/usr/lib/modules-load.d/multipath.conf
+%if %{with systemd}
%{systemdunitdir}/multipathd.service
%{systemdunitdir}/multipathd.socket
+%endif
%{systemdtmpfilesdir}/multipath.conf
%{_mandir}/man5/multipath.conf.5*
%{_mandir}/man8/mpathpersist.8*
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/multipath-tools.git/commitdiff/ad89da5455c9c84f10db6d83c4043d0ac8564952
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/polkit] - upstream patch to fix build with elogind on systems without systemd
commit c06373444087f58100fef23564497e0fd241578e
Author: Marcin Krol
Date: Sat Jul 22 13:02:51 2023 +0200
- upstream patch to fix build with elogind on systems without systemd
elogind.patch | 24
polkit.spec | 4
2 files changed, 28 insertions(+)
---
diff --git a/polkit.spec b/polkit.spec
index cbb4639..b95ebca 100644
--- a/polkit.spec
+++ b/polkit.spec
@@ -19,6 +19,7 @@ Group:Libraries
Source0:
https://gitlab.freedesktop.org/polkit/polkit/-/archive/%{version}/%{name}-%{version}.tar.bz2
# Source0-md5: 7eb1f0070c66e5e8646d23ad38773253
Patch0:systemd-fallback.patch
+Patch1:elogind.patch
URL: https://www.freedesktop.org/wiki/Software/polkit
BuildRequires: dbus-devel
BuildRequires: docbook-dtd412-xml
@@ -114,6 +115,9 @@ Pliki nagłówkowe PolicyKit.
%if %{with consolekit} && (%{with systemd} || %{with elogind})
%patch0 -p1
%endif
+%if %{with elogind}
+%patch1 -p1
+%endif
%build
%meson build \
diff --git a/elogind.patch b/elogind.patch
new file mode 100644
index 000..2eb5ce4
--- /dev/null
+++ b/elogind.patch
@@ -0,0 +1,24 @@
+diff -ur polkit-122.orig/data/meson.build polkit-122/data/meson.build
+--- polkit-122.orig/data/meson.build 2022-10-26 14:12:24.0 +0200
polkit-122/data/meson.build2023-07-22 13:01:22.590545340 +0200
+@@ -26,7 +26,7 @@
+ )
+ endif
+
+-if enable_logind
++if session_tracking == 'libsystemd-login'
+ configure_file(
+ input: 'polkit.service.in',
+ output: '@BASENAME@',
+diff -ur polkit-122.orig/meson.build polkit-122/meson.build
+--- polkit-122.orig/meson.build2022-10-26 14:12:24.0 +0200
polkit-122/meson.build 2023-07-22 13:00:31.328819850 +0200
+@@ -204,7 +204,7 @@
+
+ # systemd unit / service files
+ systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
+- if systemd_systemdsystemunitdir == ''
++ if systemd_systemdsystemunitdir == '' and session_tracking ==
'libsystemd-login'
+ systemd_dep = dependency('systemd', not_found_message: 'systemd required
but not found, please provide a valid systemd user unit dir or disable it')
+ # FIXME: systemd.pc file does not use variables with relative paths, so
`define_variable` cannot be used
+ systemd_systemdsystemunitdir =
systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/polkit.git/commitdiff/c06373444087f58100fef23564497e0fd241578e
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: elogind: elogind-252.9.tar.gz
Request by: hawk Files fetched: 1 STORED: https://github.com/elogind/elogind/archive/v252.9/elogind-252.9.tar.gz 2be2c43298e2fc41c5bee33dde605f01 elogind-252.9.tar.gz Size: 1922777 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/elogind] - updated to 252.9
commit 773b8616af14eeb1f5ad6adc503470c85225d3ff
Author: Marcin Krol
Date: Sat Jul 22 12:35:04 2023 +0200
- updated to 252.9
elogind-selinux-fix.patch | 17 -
elogind.spec | 35 ---
2 files changed, 20 insertions(+), 32 deletions(-)
---
diff --git a/elogind.spec b/elogind.spec
index f425114..6eca150 100644
--- a/elogind.spec
+++ b/elogind.spec
@@ -1,14 +1,13 @@
Summary: Elogind User, Seat and Session Manager
Summary(pl.UTF-8): Elogind - zarządca użytkowników, stanowisk i sesji
Name: elogind
-Version: 239.1
+Version: 252.9
Release: 1
License: LGPL v2.1+
Group: Daemons
# Source0Download: https://github.com/elogind/elogind/releases
Source0:
https://github.com/elogind/elogind/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 14bde82c205398bc4479284a7566e31c
-Patch0:%{name}-selinux-fix.patch
+# Source0-md5: 2be2c43298e2fc41c5bee33dde605f01
URL: https://github.com/elogind/elogind
BuildRequires: acl-devel
BuildRequires: audit-libs-devel
@@ -113,18 +112,21 @@ Pliki nagłówkowe biblioteki elogind.
%prep
%setup -q
-%patch0 -p1
%build
%meson build \
-Dhalt-path=/sbin/halt \
-Dkexec-path=/sbin/kexec \
+ -Dnologin-path=/sbin/nologin \
+ -Dpoweroff-path=/sbin/poweroff \
-Dreboot-path=/sbin/reboot \
+ -Dpamconfdir=/%{_sysconfdir}/pam.d \
-Dpamlibdir=/%{_lib}/security \
-Drootlibdir=%{_libdir} \
-Drootlibexecdir=%{_libexecdir}/%{name} \
-Dsplit-bin=true \
- -Dsplit-usr=true
+ -Dsplit-usr=true \
+ -Dman=true
%meson_build -C build
@@ -144,9 +146,6 @@ rm -rf $RPM_BUILD_ROOT
# provided by udev-core
%{__rm} $RPM_BUILD_ROOT/lib/udev/rules.d/70-power-switch.rules
-# packaged as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
%find_lang %{name}
%clean
@@ -157,44 +156,50 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc NEWS README TODO src/libelogind/sd-bus/GVARIANT-SERIALIZATION
+%doc README.md TODO
%dir %{_sysconfdir}/elogind
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/elogind/logind.conf
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/elogind/sleep.conf
%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/elogind-user
/lib/udev/rules.d/70-uaccess.rules
/lib/udev/rules.d/71-seat.rules
/lib/udev/rules.d/73-seat-late.rules
%attr(755,root,root) /%{_lib}/security/pam_elogind.so
+%attr(755,root,root) %{_bindir}/busctl
%attr(755,root,root) %{_rootbindir}/loginctl
%attr(755,root,root) %{_rootbindir}/elogind-inhibit
%dir %{_libexecdir}/elogind
%attr(755,root,root) %{_libexecdir}/elogind/elogind
%attr(755,root,root) %{_libexecdir}/elogind/elogind-cgroups-agent
%attr(755,root,root) %{_libexecdir}/elogind/elogind-uaccess-command
-%attr(755,root,root) %{_libexecdir}/elogind/libelogind-shared-%{version}.so
+%attr(755,root,root) %{_libdir}/elogind/libelogind-shared-%{version}.so
%dir %{_libexecdir}/elogind/system-shutdown
%dir %{_libexecdir}/elogind/system-sleep
%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf
-%{_datadir}/factory/etc/pam.d/other
-%{_datadir}/factory/etc/pam.d/system-auth
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
+%{_mandir}/man1/busctl.1*
%{_mandir}/man1/elogind-inhibit.1*
%{_mandir}/man1/loginctl.1*
%{_mandir}/man5/logind.conf.5*
-%{_mandir}/man7/elogind.directives.7*
-%{_mandir}/man7/elogind.index.7*
+%{_mandir}/man5/logind.conf.d.5*
+%{_mandir}/man5/org.freedesktop.login1.5*
+%{_mandir}/man5/sleep.conf.5*
+%{_mandir}/man5/sleep.conf.d.5*
+%{_mandir}/man7/elogind.journal-fields.7*
%{_mandir}/man7/elogind.syntax.7*
+%{_mandir}/man7/elogind.time.7*
%{_mandir}/man8/elogind.8*
%{_mandir}/man8/pam_elogind.8*
%files -n bash-completion-elogind
%defattr(644,root,root,755)
+%{bash_compdir}/busctl
%{bash_compdir}/loginctl
%files -n zsh-completion-elogind
%defattr(644,root,root,755)
-#%{zsh_compdir}/_elogind-inhibit
+%{zsh_compdir}/_busctl
%{zsh_compdir}/_loginctl
%files libs
diff --git a/elogind-selinux-fix.patch b/elogind-selinux-fix.patch
deleted file mode 100644
index 61c6117..000
--- a/elogind-selinux-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
elogind-239.1/src/basic/selinux-util.c.orig2018-10-17
19:50:46.0 +0200
-+++ elogind-239.1/src/basic/selinux-util.c 2018-11-22 05:40:37.017117099
+0100
-@@ -16,12 +16,12 @@
- #endif
-
- #include "alloc-util.h"
--//#include "fd-util.h"
-+#include "fd-util.h"
- #include "log.h"
- #include "macro.h"
- #include "path-util.h"
- #include "selinux-util.h"
--//#include "stdio-util.h"
-+#include "stdio-util.h"
- #include "time-util.h"
- #include "util.h"
-
gitweb:
[packages/jpackage-utils] - fix building with rpm.org
commit 37520d09cd2aaa099ed32b7d426ab4156987e30b
Author: Marcin Krol
Date: Sat Jul 22 11:32:20 2023 +0200
- fix building with rpm.org
jpackage-utils.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index fae4da5..85bc61f 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -23,6 +23,8 @@ Requires: which
Conflicts: rpmbuild(macros) < 1.409
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define_enable_debug_packages 0
+
%description
Utilities from the JPackage Project
[packages/xen] - gcc 13 patch, allow building on systems without systemd
commit 14e60c35eb4312ee6a90931a4950e99d37763d1c
Author: Marcin Krol
Date: Sat Jul 22 00:34:38 2023 +0200
- gcc 13 patch, allow building on systems without systemd
gcc13.patch | 11 +++
xen.spec| 12 ++--
2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/xen.spec b/xen.spec
index a791c88..50e9794 100644
--- a/xen.spec
+++ b/xen.spec
@@ -23,6 +23,7 @@
%bcond_without hypervisor # Xen hypervisor build
%bcond_without stubdom # stubdom build
%bcond_without xsm # XSM security module (by default,
Flask)
+%bcond_without systemd # systemd
%ifnarch %{x8664} %{arm}
%undefine with_hypervisor
@@ -104,6 +105,7 @@ Patch15:gcc10.patch
Patch16: ocaml-4.12.patch
Patch17: %{name}-golang-32bit.patch
Patch18: %{name}-gcc12.patch
+Patch19: gcc13.patch
URL: http://www.xen.org/products/xenhyp.html
BuildRequires: autoconf >= 2.67
%ifarch %{ix86} %{x8664}
@@ -152,7 +154,7 @@ BuildRequires: python3-markdown
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: seabios
-BuildRequires: systemd-devel >= 1:209
+%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
BuildRequires: texlive-dvips
BuildRequires: texlive-latex-psnfss
BuildRequires: texlive-xetex
@@ -439,6 +441,7 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z
firmware
%patch17 -p1
%endif
%patch18 -p1
+%patch19 -p1
# stubdom sources
ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom
@@ -493,8 +496,11 @@ export PATH=$(pwd)/our-ld:$PATH
%else
--with-system-qemu=/usr/bin/qemu-system-i386 \
%endif
+%if %{with systemd}
--with-systemd=%{systemdunitdir}
-
+%else
+ --disable-systemd
+%endif
export EXTRA_CFLAGS_XEN_TOOLS="%{rpmcflags} -I/usr/include/ncurses"
export EXTRA_CFLAGS_QEMU_TRADITIONAL="%{rpmcflags} -I/usr/include/ncurses"
export EXTRA_CFLAGS_QEMU_XEN="%{rpmcflags} -I/usr/include/ncurses"
@@ -667,6 +673,7 @@ fi
%attr(754,root,root) /etc/rc.d/init.d/xenstored
%attr(754,root,root) /etc/rc.d/init.d/xendomains
%attr(754,root,root) /etc/rc.d/init.d/xen-qemu-dom0-disk-backend
+%if %{with systemd}
%{_prefix}/lib/modules-load.d/xen.conf
%{systemdunitdir}/proc-xen.mount
%{systemdunitdir}/var-lib-xenstored.mount
@@ -677,6 +684,7 @@ fi
%{systemdunitdir}/xendriverdomain.service
%{systemdunitdir}/xendomains.service
%{systemdunitdir}/xen-qemu-dom0-disk-backend.service
+%endif
%dir %{_sysconfdir}/xen
%dir %{_sysconfdir}/xen/auto
%dir %{_sysconfdir}/xen/examples
diff --git a/gcc13.patch b/gcc13.patch
new file mode 100644
index 000..795e52a
--- /dev/null
+++ b/gcc13.patch
@@ -0,0 +1,11 @@
+diff -ur xen-4.16.2.orig/xen/common/bunzip2.c xen-4.16.2/xen/common/bunzip2.c
+--- xen-4.16.2.orig/xen/common/bunzip2.c 2022-08-18 13:47:46.0
+0200
xen-4.16.2/xen/common/bunzip2.c2023-07-20 22:01:47.934242320 +0200
+@@ -223,6 +223,7 @@
+ for (j = 0; j < groupCount; j++) {
+ unsigned char length[MAX_SYMBOLS], temp[MAX_HUFCODE_BITS+1];
+ int minLen, maxLen, pp;
++ length[0] = 0;
+ /* Read Huffman code lengths for each symbol. They're
+ stored in a way similar to mtf; record a starting
+ value for the first symbol, and an offset from the
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/14e60c35eb4312ee6a90931a4950e99d37763d1c
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/compat-ncurses5] - rediffed
commit e7cbaa4d573fbd55ce2a8c6c9b4686aad9542c46
Author: Marcin Krol
Date: Fri Jul 21 00:05:15 2023 +0200
- rediffed
ncurses-fix-nonunicode-breakage.patch | 13 +++--
ncurses-meta.patch| 15 ---
ncurses-mouse_trafo-warning.patch | 11 ++-
3 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/ncurses-fix-nonunicode-breakage.patch
b/ncurses-fix-nonunicode-breakage.patch
index 2a23fb4..0219e42 100644
--- a/ncurses-fix-nonunicode-breakage.patch
+++ b/ncurses-fix-nonunicode-breakage.patch
@@ -4,13 +4,14 @@ codes - it had a chance to work on non-unicode terminal only
if G1 was mapped
to CP437 map, which is not the default; the default for G1 is VT100 map, which
works with VT100-specific acsc string - and that's what this patch changes.
ncurses-5.9/misc/terminfo.src.orig 2011-11-05 08:32:32.280686759 +0100
-+++ ncurses-5.9/misc/terminfo.src 2011-11-05 13:37:42.217966510 +0100
-@@ -945,6 +945,7 @@
- # Using SI/SO has the drawback that it confuses screen. SCS would work.
- # However, SCS is buggy (see comment in Debian #515609) -TD
+diff -urNp -x '*.orig' compat-ncurses5-5.9.20150117.org/misc/terminfo.src
compat-ncurses5-5.9.20150117/misc/terminfo.src
+--- compat-ncurses5-5.9.20150117.org/misc/terminfo.src 2023-07-21
00:00:49.116051986 +0200
compat-ncurses5-5.9.20150117/misc/terminfo.src 2023-07-21
00:00:50.115066314 +0200
+@@ -1633,6 +1633,7 @@ linux2.2|linux 2.2.x console,
+ # Further, this breaks longstanding workarounds for Linux console's line
+ # drawing (see Debian 665959) -TD
linux2.6|linux 2.6.x console,
+ acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
rmacs=^O,
-
sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+
sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
sgr0=\E[m\017, smacs=^N, use=linux2.2,
diff --git a/ncurses-meta.patch b/ncurses-meta.patch
index 9a735b7..5c3ac5e 100644
--- a/ncurses-meta.patch
+++ b/ncurses-meta.patch
@@ -1,6 +1,7 @@
ncurses-5.6/misc/terminfo.src.orig 2006-12-30 16:57:06.000124384 +0100
-+++ ncurses-5.6/misc/terminfo.src 2006-12-30 16:59:12.647341598 +0100
-@@ -2741,7 +2741,7 @@
+diff -urNp -x '*.orig' compat-ncurses5-5.9.20150117.org/misc/terminfo.src
compat-ncurses5-5.9.20150117/misc/terminfo.src
+--- compat-ncurses5-5.9.20150117.org/misc/terminfo.src 2023-07-20
23:59:03.823541888 +0200
compat-ncurses5-5.9.20150117/misc/terminfo.src 2023-07-20
23:59:04.799555886 +0200
+@@ -3607,7 +3607,7 @@ putty-sco|putty with SCO function keys,
# "resize -s"), though it does not pass SIGWINCH to the application if the
# user resizes the window with the mouse.
teraterm2.3|Tera Term Pro,
@@ -9,7 +10,7 @@
ncv#43, vt@,
acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J,
-@@ -3240,7 +3240,7 @@
+@@ -3786,7 +3786,7 @@ xterm-r5|xterm R5 version,
# (khome/kend do not actually work in X11R5 or X11R6, but many people use this
# for compatibility with other emulators).
xterm-r6|xterm X11R6 version,
@@ -18,9 +19,9 @@
cols#80, it#8, lines#24,
acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=^M,
-@@ -4138,7 +4138,7 @@
- #
- # tested with screen 3.09.08
+@@ -5891,7 +5891,7 @@ eterm-color|Emacs term.el terminal emula
+ # sgr are not impacted (because that usually resets all capabilities before
+ # setting any), but termcap applications do not use sgr -TD
screen|VT 100/ANSI X3.64 virtual terminal,
- OTbs, OTpt, am, km, mir, msgr, xenl, G0,
+ OTbs, OTpt, am, mir, msgr, xenl, G0,
diff --git a/ncurses-mouse_trafo-warning.patch
b/ncurses-mouse_trafo-warning.patch
index 9201312..ae368cf 100644
--- a/ncurses-mouse_trafo-warning.patch
+++ b/ncurses-mouse_trafo-warning.patch
@@ -1,8 +1,9 @@
ncurses-5.2/include/curses.tail~ Sat Jun 16 13:47:06 2001
-+++ ncurses-5.2/include/curses.tailThu Mar 21 16:58:13 2002
-@@ -59,8 +59,6 @@
- extern NCURSES_EXPORT(int) mouseinterval (int);
- extern NCURSES_EXPORT(bool) wmouse_trafo (const WINDOW* win,int* y, int* x,
bool to_screen);
+diff -urNp -x '*.orig' compat-ncurses5-5.9.20150117.org/include/curses.tail
compat-ncurses5-5.9.20150117/include/curses.tail
+--- compat-ncurses5-5.9.20150117.org/include/curses.tail 2023-07-21
00:00:22.913676193 +0200
compat-ncurses5-5.9.20150117/include/curses.tail 2023-07-21
00:00:24.466698467 +0200
+@@ -111,8 +111,6 @@ extern NCURSES_EXPORT(mmask_t) NCURSES_S
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mouseinterval) (SCREEN*, int);
+ #endif
-#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
-
[packages/nvidia-settings] - fix building w/o utils on rpm.org
commit f87abd909d89225c6eea6829277ab3e7fdab433a
Author: Marcin Krol
Date: Thu Jul 20 19:11:24 2023 +0200
- fix building w/o utils on rpm.org
nvidia-settings.spec | 4
1 file changed, 4 insertions(+)
---
diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 34fd377..efad69d 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -40,6 +40,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# requires symbols from main binary
%defineskip_post_check_so libnvidia-gtk[23].so.*
+%if !%{with utils}
+%define_enable_debug_packages 0
+%endif
+
%description
The nvidia-settings utility is a tool for configuring the NVIDIA Linux
graphics driver. It operates by communicating with the NVIDIA X
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nvidia-settings.git/commitdiff/f87abd909d89225c6eea6829277ab3e7fdab433a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/seabios] - use python3
commit ff23be32e25f163936e8a60fcc149e2475c2252d
Author: Marcin Krol
Date: Thu Jul 20 18:52:59 2023 +0200
- use python3
seabios.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/seabios.spec b/seabios.spec
index 2a773f2..5aa5072 100644
--- a/seabios.spec
+++ b/seabios.spec
@@ -14,7 +14,7 @@ BuildRequires:acpica
BuildRequires: crossx8664-binutils
BuildRequires: crossx8664-gcc
%endif
-BuildRequires: python
+BuildRequires: python3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define_enable_debug_packages 0
@@ -38,7 +38,7 @@ SeaBIOS to domyślny BIOS dla narzędzi QEMU, KVM i Xen HVM.
%build
%{__make} \
- V=1 \
+ V=1 PYTHON=%{__python3} \
%ifnarch %{ix86} %{x8664} x32
CROSS_PREFIX=x86_64-pld-linux
%endif
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/seabios.git/commitdiff/ff23be32e25f163936e8a60fcc149e2475c2252d
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/open-iscsi] - allow building on systems without systemd
commit a8caebbe0f74058c6b7a60acc2309f7af0e8ba82
Author: Marcin Krol
Date: Thu Jul 20 17:49:37 2023 +0200
- allow building on systems without systemd
open-iscsi.spec | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/open-iscsi.spec b/open-iscsi.spec
index a03e927..7196df4 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -2,6 +2,7 @@
# Conditional build:
%bcond_without python2 # CPython 2.x module
%bcond_without python3 # CPython 3.x module
+%bcond_without systemd # systemd
Summary: iSCSI - SCSI over IP
Summary(pl.UTF-8): iSCSI - SCSI po IP
@@ -153,12 +154,13 @@ cd iscsiuio
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+%configure \
+ %{!?with_systemd:--without-systemd}
cd ..
%{__make} \
CC="%{__cc}" \
- OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \
+ OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{!?with_systemd:-DNO_SYSTEMD}" \
SED=sed \
KSUBLEVEL=0
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/open-iscsi.git/commitdiff/a8caebbe0f74058c6b7a60acc2309f7af0e8ba82
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/open-isns] - allow building on systems without systemd
commit d76e539699fcf08879ba88f1c999ced218e38d44
Author: Marcin Krol
Date: Thu Jul 20 17:39:38 2023 +0200
- allow building on systems without systemd
open-isns.spec | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/open-isns.spec b/open-isns.spec
index e362949..407e7f7 100644
--- a/open-isns.spec
+++ b/open-isns.spec
@@ -2,6 +2,7 @@
#
# Conditional build:
%bcond_without static_libs # static libraries
+%bcond_without systemd # systemd
#
Summary: Partial implementation of iSNS (RFC 4171)
Summary(pl.UTF-8): Częściowa implementacja iSNS (RFC 4171)
@@ -70,7 +71,7 @@ Statyczna biblioteka Open-iSNS.
%build
%meson build \
- -Dsystemddir=%{_systemd_util_dir} \
+ %{?with_systemd:-Dsystemddir=%{_systemd_util_dir}} \
%{!?with_static_libs:--default-library=shared}
%ninja_build -C build
@@ -104,8 +105,10 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isns/isnsadm.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isns/isnsd.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/isns/isnsdd.conf
+%if %{with systemd}
%{systemdunitdir}/isnsd.service
%{systemdunitdir}/isnsd.socket
+%endif
%dir /var/lib/isns
%{_mandir}/man5/isns_config.5*
%{_mandir}/man8/isnsadm.8*
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/open-isns.git/commitdiff/d76e539699fcf08879ba88f1c999ced218e38d44
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dbus] - bconds for API docs and ducktype docs
commit 66af626dd194f15fbdaf067faf18d475f4cc595a
Author: Marcin Krol
Date: Wed Jul 19 14:09:56 2023 +0200
- bconds for API docs and ducktype docs
dbus.spec | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/dbus.spec b/dbus.spec
index c35ba13..1620332 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -1,9 +1,11 @@
# TODO:
-# - enable ducktype-docs when it works
+# - enable ducktype-docs when it works and update files if necessary
# - move /etc/dbus-1 from -libs to base after external packages transition to
/usr/share/dbus-1
#
# Conditional build:
+%bcond_without apidocs # API docs
%bcond_without apparmor# AppArmor support
+%bcond_withducktype# ducktype docs
%bcond_without selinux # SELinux support
%bcond_without systemd # systemd at_console support
%bcond_without X11 # X11 support
@@ -34,7 +36,7 @@ BuildRequires:autoconf >= 2.63
BuildRequires: autoconf-archive >= 2019.01.06
BuildRequires: automake >= 1:1.13
BuildRequires: docbook-dtd44-xml
-BuildRequires: doxygen
+%{?with_apidocs:BuildRequires: doxygen}
BuildRequires: expat-devel >= %{expat_version}
%{?with_apparmor:BuildRequires:libapparmor-devel >= 1:2.10}
BuildRequires: libcap-ng-devel
@@ -42,7 +44,7 @@ BuildRequires:libcap-ng-devel
BuildRequires: libtool >= 2:2.0
BuildRequires: libxslt-progs
BuildRequires: pkgconfig
-#BuildRequires:python3-ducktype
+%{?with_ducktype:BuildRequires:python3-ducktype}
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 2.011
BuildRequires: sed >= 4.0
@@ -51,7 +53,7 @@ BuildRequires:tar >= 1:1.22
BuildRequires: xmlto
%{?with_X11:BuildRequires: xorg-lib-libX11-devel}
BuildRequires: xz
-BuildRequires: yelp-tools
+%{?with_ducktype:BuildRequires:yelp-tools}
Requires(post,postun): /sbin/ldconfig
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
@@ -171,9 +173,10 @@ D-BUS wraz z sesją X11 użytkownika.
%{__autoheader}
%{__automake}
%configure \
+ %{!?with_apidocs:--disable-doxygen-docs} \
%{!?with_apparmor:--disable-apparmor} \
--disable-asserts \
- --disable-ducktype-docs \
+ %{!?with_ducktype:--disable-ducktype-docs} \
%{?debug:--enable-verbose-mode} \
%{!?with_selinux:--disable-selinux} \
--disable-silent-rules \
@@ -337,10 +340,12 @@ fi
%defattr(644,root,root,755)
%{_libdir}/libdbus-1.a
+%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
%{_docdir}/dbus/api
%{_docdir}/dbus/dbus.devhelp2
+%endif
%files x11
%defattr(644,root,root,755)
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dbus.git/commitdiff/66af626dd194f15fbdaf067faf18d475f4cc595a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mongo-c-driver] - switch to Python 3
commit ece3e9c424ca27ad414b507868aa08b804cfb752
Author: Marcin Krol
Date: Tue Jul 18 22:01:57 2023 +0200
- switch to Python 3
mongo-c-driver.spec | 4 +++-
python3.patch | 17 +
2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/mongo-c-driver.spec b/mongo-c-driver.spec
index 1c4dbf1..f053fc9 100644
--- a/mongo-c-driver.spec
+++ b/mongo-c-driver.spec
@@ -21,13 +21,14 @@ Group: Libraries
#Source0Download: https://github.com/mongodb/mongo-c-driver/releases/
Source0:
https://github.com/mongodb/mongo-c-driver/releases/download/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 8e88d6d3b5360d81ce61e98fce27df94
+Patch0:python3.patch
URL: https://github.com/mongodb/mongo-c-driver
BuildRequires: cmake >= 3.15
%{?with_sasl:BuildRequires:cyrus-sasl-devel}
BuildRequires: libicu-devel
%{?with_ssl:BuildRequires: openssl-devel}
BuildRequires: pkgconfig
-BuildRequires: python
+BuildRequires: python3 >= 1:3.2
BuildRequires: snappy-devel
%{?with_doc:BuildRequires: sphinx-pdg}
BuildRequires: zlib-devel >= 1.2.12
@@ -131,6 +132,7 @@ Dokumentacja API biblioteki libbson.
%prep
%setup -q
+%patch0 -p1
%build
%cmake -B cmake-build \
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 000..ccdb026
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,17 @@
+diff -ur mongo-c-driver-1.24.1.orig/CMakeLists.txt
mongo-c-driver-1.24.1/CMakeLists.txt
+--- mongo-c-driver-1.24.1.orig/CMakeLists.txt 2023-06-21 14:31:37.0
+0200
mongo-c-driver-1.24.1/CMakeLists.txt 2023-07-18 21:59:49.39128
+0200
+@@ -240,10 +240,10 @@
+ file (STRINGS ${PROJECT_SOURCE_DIR}/VERSION_CURRENT BUILD_VERSION)
+ message (STATUS "file VERSION_CURRENT contained BUILD_VERSION
${BUILD_VERSION}")
+else ()
+- find_package (PythonInterp)
+- if (PYTHONINTERP_FOUND)
++ find_package (Python3 3.2 REQUIRED)
++ if (Python3_FOUND)
+ execute_process (
+-COMMAND ${PYTHON_EXECUTABLE} build/calc_release_version.py
++COMMAND ${Python3_EXECUTABLE} build/calc_release_version.py
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ OUTPUT_VARIABLE CALC_RELEASE_VERSION
+ RESULT_VARIABLE CALC_RELEASE_VERSION_RESULT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mongo-c-driver.git/commitdiff/ece3e9c424ca27ad414b507868aa08b804cfb752
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qt5-qtwebkit] - builds fine without gstreamer-plugins-bad-devel
commit de2733b20372bee2ac0cc6fccced17f506bd41be Author: Marcin Krol Date: Sun Jul 16 23:10:33 2023 +0200 - builds fine without gstreamer-plugins-bad-devel qt5-qtwebkit.spec | 1 - 1 file changed, 1 deletion(-) --- diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 3f062e5..632ec82 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -70,7 +70,6 @@ BuildRequires:glib2-devel >= 1:2.36 BuildRequires: gperf >= 3.0.1 BuildRequires: gstreamer-devel >= 1.0.3 BuildRequires: gstreamer-gl-devel >= 1.6.0 -#BuildRequires:gstreamer-plugins-bad-devel >= 1.4.0 BuildRequires: gstreamer-plugins-base-devel >= 1.0.3 BuildRequires: hyphen-devel BuildRequires: libicu-devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/de2733b20372bee2ac0cc6fccced17f506bd41be ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qt5-qtwebkit] - switched to Python 3.x
commit 8b34501f4339bde7518167493bce1d68ad47ff13
Author: Marcin Krol
Date: Sun Jul 16 22:36:00 2023 +0200
- switched to Python 3.x
python3.9.patch | 27 +++
python3.patch | 212 ++
qt5-qtwebkit.spec | 8 ++-
3 files changed, 245 insertions(+), 2 deletions(-)
---
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 062c0b7..3f062e5 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -45,6 +45,8 @@ Patch1: %{name}-docs.patch
Patch2:glib2.68.patch
Patch3:%{name}-gstreamer.patch
Patch4:gcc13.patch
+Patch5:python3.patch
+Patch6:python3.9.patch
# from FC
Patch102: qtwebkit-5.212.0_cmake_cmp0071.patch
Patch108: x32.patch
@@ -68,7 +70,7 @@ BuildRequires:glib2-devel >= 1:2.36
BuildRequires: gperf >= 3.0.1
BuildRequires: gstreamer-devel >= 1.0.3
BuildRequires: gstreamer-gl-devel >= 1.6.0
-BuildRequires: gstreamer-plugins-bad-devel >= 1.4.0
+#BuildRequires:gstreamer-plugins-bad-devel >= 1.4.0
BuildRequires: gstreamer-plugins-base-devel >= 1.0.3
BuildRequires: hyphen-devel
BuildRequires: libicu-devel
@@ -80,7 +82,7 @@ BuildRequires:libxml2-devel >= 1:2.8.0
BuildRequires: libxslt-devel >= 1.1.7
BuildRequires: perl-base >= 1:5.10.0
BuildRequires: pkgconfig
-BuildRequires: python >= 1:2.7.0
+BuildRequires: python3 >= 1:3.2
BuildRequires: ruby >= 1:1.9
%if %{with doc}
BuildRequires: qt5-assistant >= %{qttools_ver}
@@ -197,6 +199,8 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%patch102 -p1
%patch108 -p1
diff --git a/python3.9.patch b/python3.9.patch
new file mode 100644
index 000..bad26ef
--- /dev/null
+++ b/python3.9.patch
@@ -0,0 +1,27 @@
+From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev
+Date: Wed, 3 Jun 2020 15:01:42 +0300
+Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to
+ json.load()
+
+In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument
+is not supported.
+
+Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9
+---
+ Source/JavaScriptCore/generate-bytecode-files | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/generate-bytecode-files
b/Source/JavaScriptCore/generate-bytecode-files
+index c5dab429c7b0f..af3431275ecf9 100644
+--- a/Source/JavaScriptCore/generate-bytecode-files
b/Source/JavaScriptCore/generate-bytecode-files
+@@ -163,7 +163,7 @@ if __name__ == "__main__":
+ initBytecodesFile = openOrExit(initASMFileName, "w")
+
+ try:
+-bytecodeSections = json.load(bytecodeFile, encoding = "utf-8")
++bytecodeSections = json.load(bytecodeFile)
+ except:
+ print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile,
sys.exc_info()))
+
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 000..db7aeb2
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,212 @@
+diff -ur qtwebkit-5.212.0-alpha4.orig/Source/cmake/WebKitCommon.cmake
qtwebkit-5.212.0-alpha4/Source/cmake/WebKitCommon.cmake
+--- qtwebkit-5.212.0-alpha4.orig/Source/cmake/WebKitCommon.cmake
2020-03-04 18:16:37.0 +0100
qtwebkit-5.212.0-alpha4/Source/cmake/WebKitCommon.cmake2023-07-16
16:19:42.736634911 +0200
+@@ -24,8 +24,7 @@
+ # TODO Enforce version requirement for perl
+ find_package(Perl 5.10.0 REQUIRED)
+
+-set(Python_ADDITIONAL_VERSIONS 3)
+-find_package(PythonInterp 2.7.0 REQUIRED)
++find_package(Python3 3.2 REQUIRED)
+
+ # We cannot check for RUBY_FOUND because it is set only when the full
package is installed and
+ # the only thing we need is the interpreter. Unlike Python, cmake does
not provide a macro
+diff -ur qtwebkit-5.212.0-alpha4.orig/Source/cmake/WebKitMacros.cmake
qtwebkit-5.212.0-alpha4/Source/cmake/WebKitMacros.cmake
+--- qtwebkit-5.212.0-alpha4.orig/Source/cmake/WebKitMacros.cmake
2020-03-04 18:16:37.0 +0100
qtwebkit-5.212.0-alpha4/Source/cmake/WebKitMacros.cmake2023-07-16
16:20:46.885546011 +0200
+@@ -368,8 +368,8 @@
+ ${WEBKIT2_DIR}/Scripts/webkit/messages.py
+ ${WEBKIT2_DIR}/Scripts/webkit/model.py
+ ${WEBKIT2_DIR}/Scripts/webkit/parser.py
+-COMMAND ${PYTHON_EXECUTABLE}
${WEBKIT2_DIR}/Scripts/generate-message-receiver.py ${_file} >
${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}MessageReceiver.cpp
+-COMMAND ${PYTHON_EXECUTABLE}
${WEBKIT2_DIR}/Scripts/generate-messages-header.py ${_file} >
${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}Messages.h
++COMMAND ${Python3_EXECUTABLE}
${WEBKIT2_DIR}/Scripts/generate-message-receiver.py ${_file} >
${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}MessageReceiver.cpp
++COMMAND ${Python3_EXECUTABLE}
[packages/gstreamer-plugins-base] - versioned python3 BR
commit 95ac7fd60fa43710d27dc3b738327828183b8bed Author: Marcin Krol Date: Sun Jul 16 14:55:24 2023 +0200 - versioned python3 BR gstreamer-plugins-base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec index 1c6ffa7..dbf99b8 100644 --- a/gstreamer-plugins-base.spec +++ b/gstreamer-plugins-base.spec @@ -37,7 +37,7 @@ BuildRequires:meson >= 0.62 BuildRequires: ninja >= 1.5 BuildRequires: orc-devel >= 0.4.24 BuildRequires: pkgconfig >= 1:0.9.0 -BuildRequires: python3 +BuildRequires: python3 >= 1:3.2 BuildRequires: rpm-build >= 4.6 BuildRequires: rpmbuild(macros) >= 1.736 BuildRequires: tar >= 1:1.22 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gstreamer-plugins-base.git/commitdiff/95ac7fd60fa43710d27dc3b738327828183b8bed ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gstreamer-plugins-base] - BR python3
commit c6ced55c3961979d05d51592a24c06054c0b5f61 Author: Marcin Krol Date: Sun Jul 16 14:52:45 2023 +0200 - BR python3 gstreamer-plugins-base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec index acc4fad..1c6ffa7 100644 --- a/gstreamer-plugins-base.spec +++ b/gstreamer-plugins-base.spec @@ -37,7 +37,7 @@ BuildRequires:meson >= 0.62 BuildRequires: ninja >= 1.5 BuildRequires: orc-devel >= 0.4.24 BuildRequires: pkgconfig >= 1:0.9.0 -BuildRequires: python >= 2.1 +BuildRequires: python3 BuildRequires: rpm-build >= 4.6 BuildRequires: rpmbuild(macros) >= 1.736 BuildRequires: tar >= 1:1.22 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gstreamer-plugins-base.git/commitdiff/c6ced55c3961979d05d51592a24c06054c0b5f61 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/llvm] - fix building without lldb
commit 76a62f5e02ddb4e324551f9a6d621698fa90b7b9
Author: Marcin Krol
Date: Fri Jul 14 11:08:48 2023 +0200
- fix building without lldb
llvm.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/llvm.spec b/llvm.spec
index 15f8a4c..c564d21 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -817,6 +817,7 @@ fi
%{__make} -C tools/clang/docs docs-clang-html
%{__make} -C tools/clang/docs docs-clang-man
%{__make} -C tools/lld/docs docs-lld-html
+%if %{with lldb}
# workaround failed import of _lldb
cp -pnL %{_lib}/liblldb.so tools/lldb/docs/lldb/_lldb.so
%{__make} \
@@ -824,6 +825,7 @@ cp -pnL %{_lib}/liblldb.so tools/lldb/docs/lldb/_lldb.so
-C tools/lldb/docs lldb-python-doc-package
%{__make} -C tools/lldb/docs lldb-cpp-doc
%endif
+%endif
%install
rm -rf $RPM_BUILD_ROOT
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/76a62f5e02ddb4e324551f9a6d621698fa90b7b9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nginx] - builds fine without python 2.x, BR python3
commit f45c47bf60251f261afd93711ad8b136631b2005
Author: Marcin Krol
Date: Tue Jul 11 15:38:36 2023 +0200
- builds fine without python 2.x, BR python3
nginx.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nginx.spec b/nginx.spec
index dbfdbfc..4446b6c 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -96,7 +96,7 @@ BuildRequires: libmodsecurity-devel
%if %{with perl}
BuildRequires: perl-CGI
BuildRequires: perl-devel
-BuildRequires: python
+BuildRequires: python3
BuildRequires: rpm-perlprov
%endif
%if %{with ssl}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/f45c47bf60251f261afd93711ad8b136631b2005
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-app-xdm] - allow building on systems without systemd
commit 12fedaa82fcb8d1942917b756b075e5f8b1b6b82
Author: Marcin Krol
Date: Mon Jul 10 17:31:50 2023 +0200
- allow building on systems without systemd
xorg-app-xdm.spec | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/xorg-app-xdm.spec b/xorg-app-xdm.spec
index ff0f851..2d22cbe 100644
--- a/xorg-app-xdm.spec
+++ b/xorg-app-xdm.spec
@@ -1,13 +1,14 @@
# TODO
# - Source1 contains X11R6 paths and the scripts inside should be reviewed for
# security issues
+%bcond_without systemd # systemd
Summary: xdm - X Display Manager with support for XDMCP, host chooser
Summary(pl.UTF-8): XDM - zarządca ekranów z obsługą XDMCP i wybieraniem
hostów
Summary(ru.UTF-8): Менеджер дисплея X
Summary(uk.UTF-8): Менеджер дисплею X
Name: xorg-app-xdm
Version: 1.1.14
-Release: 2
+Release: 3
License: MIT
Group: X11/Applications
Source0:
https://xorg.freedesktop.org/releases/individual/app/xdm-%{version}.tar.xz
@@ -47,7 +48,7 @@ BuildRequires:xorg-lib-libXt-devel >= 1.0.0
BuildRequires: xorg-lib-xtrans-devel
BuildRequires: xorg-proto-xproto-devel >= 7.0.17
BuildRequires: xorg-util-util-macros >= 1.8
-BuildRequires: systemd-devel >= 1:209
+%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
BuildRequires: systemd-units >= 38
BuildRequires: xz
Requires(post,preun): /sbin/chkconfig
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-app-xdm.git/commitdiff/12fedaa82fcb8d1942917b756b075e5f8b1b6b82
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/smartmontools] - allow building without systemd
commit 51bc61374f3a48022b6d3c6463c120ed1434d973
Author: Marcin Krol
Date: Mon Jul 10 13:29:35 2023 +0200
- allow building without systemd
smartmontools.spec | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/smartmontools.spec b/smartmontools.spec
index 516e0ae..552c7a3 100644
--- a/smartmontools.spec
+++ b/smartmontools.spec
@@ -6,6 +6,7 @@
%bcond_without capng # build without libpcap-ng
%endif
%bcond_without selinux # SELinux support
+%bcond_without systemd
Summary: S.M.A.R.T. control and monitoring of ATA/SCSI harddisks
Summary(cs.UTF-8): smartmontools - pro monitorování S.M.A.R.T. disků a
zařízení
@@ -36,7 +37,7 @@ BuildRequires:libstdc++-devel >= 6:4.8.1
BuildRequires: pkgconfig
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.647
-BuildRequires: systemd-devel
+%{?with_systemd:BuildRequires: systemd-devel}
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts >= 0.4.3.0
%if "%{pld_release}" != "ac"
@@ -177,10 +178,14 @@ sobre unidades de disco.
--with-savestates=/var/lib/smartmontools/smartd. \
--with-attributelog=/var/lib/smartmontools/attrlog. \
--with-drivedbdir=/var/lib/smartmontools/drivedb \
- --with-systemdsystemunitdir=%{systemdunitdir} \
--with-smartdscriptdir=/usr/share/smartmontools \
--with-smartdplugindir=/etc/smartmontools/smartd_warning.d \
+%if %{with systemd}
+ --with-systemdsystemunitdir=%{systemdunitdir} \
--with-systemdenvfile=/etc/sysconfig/smartmontools
+%else
+ --without-libsystemd
+%endif
%{__make}
@@ -232,7 +237,9 @@ fi
%attr(755,root,root) %{_sbindir}/smartctl
%attr(755,root,root) %{_sbindir}/smartd
%attr(755,root,root) %{_sbindir}/update-smart-drivedb
+%if %{with systemd}
%{systemdunitdir}/smartd.service
+%endif
%dir %{_datadir}/smartmontools
%attr(755,root,root) %{_datadir}/%{name}/smartd-runner
%attr(755,root,root) %{_datadir}/%{name}/smartd_warning.sh
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/smartmontools.git/commitdiff/51bc61374f3a48022b6d3c6463c120ed1434d973
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: SysVinit: sysvinit-3.04.tar.xz sysvinit-non-english-man-pages.tar.bz2
Request by: hawk Files fetched: 1 STORED: http://download.savannah.gnu.org/releases/sysvinit/sysvinit-3.04.tar.xz 9a00e5f15dd2f038f10feee50677ebff sysvinit-3.04.tar.xz Size: 220184 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/sysvinit-non-english-man-pages.tar.bz2 9ae8a63a4685368fae19707f95475cca sysvinit-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/SysVinit] - updated to 3.04
commit f856fc6fa5f0ed7d65fabcdeaba84fa0222d6938
Author: Marcin Krol
Date: Mon Jul 10 13:33:30 2023 +0200
- updated to 3.04
SysVinit.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/SysVinit.spec b/SysVinit.spec
index 38eee0b..ca1500a 100644
--- a/SysVinit.spec
+++ b/SysVinit.spec
@@ -12,12 +12,12 @@ Summary(ru.UTF-8): Программы, управляющие базовыми
Summary(tr.UTF-8): System V başlatma programı
Summary(uk.UTF-8): Програми, що керують базовими системними процесами
Name: SysVinit
-Version: 3.02
+Version: 3.04
Release: 1
License: GPL v2+
Group: Base
Source0:
http://download.savannah.gnu.org/releases/sysvinit/sysvinit-%{version}.tar.xz
-# Source0-md5: db6ef4ee503211cb45cdd56735108942
+# Source0-md5: 9a00e5f15dd2f038f10feee50677ebff
Source1: sysvinit.logrotate
Source2:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/sysvinit-non-english-man-pages.tar.bz2
# Source2-md5: 9ae8a63a4685368fae19707f95475cca
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/SysVinit.git/commitdiff/f856fc6fa5f0ed7d65fabcdeaba84fa0222d6938
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/e2fsprogs] - allow building without scrub utilities
commit 9f18748dee28ec8c5a4dcf82837bc8f2fa52606b
Author: Marcin Krol
Date: Mon Jul 10 13:15:40 2023 +0200
- allow building without scrub utilities
e2fsprogs.spec | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index ab854eb..5efa2b4 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -8,6 +8,7 @@
%bcond_without fuse# fuse2fs program
%bcond_without nls # build without NLS
%bcond_without tls # TLS
+%bcond_without scrub # don't package e2scrub* utilities
%if "%{pld_release}" == "ac"
%bcond_withinitrd # don't build initrd version
%bcond_without uClibc # link initrd version with static glibc instead
of uClibc
@@ -797,8 +798,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) /sbin/e2image
%attr(755,root,root) /sbin/e2label
%attr(755,root,root) /sbin/e2mmpstatus
+%if %{with scrub}
%attr(755,root,root) /sbin/e2scrub
%attr(755,root,root) /sbin/e2scrub_all
+%endif
%attr(755,root,root) /sbin/e2undo
%attr(755,root,root) /sbin/fsck.ext2
%attr(755,root,root) /sbin/fsck.ext3
@@ -818,18 +821,22 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_sbindir}/mklost+found
%attr(755,root,root) %{_libdir}/e2initrd_helper
%dir %{_libdir}/e2fsprogs
+%if %{with scrub}
%attr(755,root,root) %{_libdir}/e2fsprogs/e2scrub_all_cron
%attr(755,root,root) %{_libdir}/e2fsprogs/e2scrub_fail
%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/e2scrub_all
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2fsck.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2scrub.conf
+%endif
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2fsck.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mke2fs.conf
+%if %{with scrub}
%{systemdunitdir}/e2scrub@.service
%{systemdunitdir}/e2scrub_all.service
%{systemdunitdir}/e2scrub_all.timer
%{systemdunitdir}/e2scrub_fail@.service
%{systemdunitdir}/e2scrub_reap.service
/lib/udev/rules.d/96-e2scrub.rules
+%endif
%{_mandir}/man1/chattr.1*
%{_mandir}/man1/lsattr.1*
%{_mandir}/man5/e2fsck.conf.5*
@@ -845,8 +852,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/e2image.8*
%{_mandir}/man8/e2label.8*
%{_mandir}/man8/e2mmpstatus.8*
+%if %{with scrub}
%{_mandir}/man8/e2scrub.8*
%{_mandir}/man8/e2scrub_all.8*
+%endif
%{_mandir}/man8/e2undo.8*
%{_mandir}/man8/e4crypt.8*
%{_mandir}/man8/e4defrag.8*
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/e2fsprogs.git/commitdiff/9f18748dee28ec8c5a4dcf82837bc8f2fa52606b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xfsprogs] - allow building without scrub
commit 98f845f41d80ceb42f26934716bea6d5e47d83cd
Author: Marcin Krol
Date: Mon Jul 10 12:50:43 2023 +0200
- allow building without scrub
xfsprogs.spec | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/xfsprogs.spec b/xfsprogs.spec
index d683959..c70c35f 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,6 +1,7 @@
#
# Conditional build:
%bcond_without debug_asserts
+%bcond_without scrub
#
Summary: Tools for the XFS filesystem
Summary(pl.UTF-8): Narzędzia do systemu plików XFS
@@ -35,7 +36,7 @@ BuildRequires:libuuid-static
BuildRequires: pkgconfig
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.402
-BuildRequires: systemd-devel
+%{?with_scrub:BuildRequires: systemd-devel}
BuildRequires: userspace-rcu-devel
BuildRequires: userspace-rcu-static
BuildRequires: sed >= 4.0
@@ -135,7 +136,7 @@ Biblioteki statyczne do XFS.
--enable-gettext \
--enable-libicu \
--disable-lto \
- --enable-scrub=yes
+ %{?with_scrub:--enable-scrub=yes}
%{__make} \
V=1
@@ -166,7 +167,11 @@ ln -sf /%{_lib}/$(basename
$RPM_BUILD_ROOT/%{_lib}/libhandle.so.*.*.*) \
%{__rm} $RPM_BUILD_ROOT/%{_lib}/libhandle.{so,la,a}
# install cron file
+%if %{with scrub}
%{__mv}
$RPM_BUILD_ROOT{%{_libdir}/%{name}/xfs_scrub_all.cron,/etc/cron.d/xfs_scrub_all}
+%else
+%{__rm} $RPM_BUILD_ROOT/%{_libdir}/%{name}/xfs_scrub_all.cron
+%endif
# (config file paths are specified in libfrog/projects.c)
echo "#10:/mnt/ftp/roman" >> $RPM_BUILD_ROOT/etc/projects
@@ -194,20 +199,27 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) /sbin/mkfs.xfs
%attr(755,root,root) /sbin/xfs_repair
%attr(755,root,root) %{_sbindir}/xfs_*
+%if %{with scrub}
%exclude %{_sbindir}/xfs_scrub*
+%endif
%attr(755,root,root) /%{_lib}/libhandle.so.*.*
%attr(755,root,root) %ghost /%{_lib}/libhandle.so.1
%{_datadir}/%{name}
%dir %{_libdir}/%{name}
+%if %{with scrub}
%attr(755,root,root) %{_libdir}/%{name}/xfs_scrub_fail
+%endif
%{_mandir}/man5/projects.5*
%{_mandir}/man5/projid.5*
%{_mandir}/man5/xfs.5*
%{_mandir}/man8/fsck.xfs.8*
%{_mandir}/man8/mkfs.xfs.8*
%{_mandir}/man8/xfs_*.8*
+%if %{with scrub}
%exclude %{_mandir}/man8/xfs_scrub*.8*
+%endif
+%if %{with scrub}
%files scrub
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/xfs_scrub
@@ -219,6 +231,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/xfs_scrub_all
%{_mandir}/man8/xfs_scrub.8*
%{_mandir}/man8/xfs_scrub_all.8*
+%endif
%files devel
%defattr(644,root,root,755)
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfsprogs.git/commitdiff/98f845f41d80ceb42f26934716bea6d5e47d83cd
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: hdparm: hdparm-9.65.tar.gz
Request by: hawk Files fetched: 1 STORED: https://downloads.sourceforge.net/hdparm/hdparm-9.65.tar.gz 6d6d039d61ec995b1ec72ddce0b1853b hdparm-9.65.tar.gz Size: 140425 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/hdparm] - updated to 9.65
commit 55af20ff879cc19f5f07ef4415e53924f9a3f844
Author: Marcin Krol
Date: Sun Jul 9 23:54:35 2023 +0200
- updated to 9.65
hdparm.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/hdparm.spec b/hdparm.spec
index d9b67ad..e69d8df 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -8,12 +8,12 @@ Summary(ru.UTF-8):Утилита для показа/настройки пар
Summary(tr.UTF-8): (E)IDE/SATA/SAS sabit disklerle ilgili bazı
parametreleri değiştirir
Summary(uk.UTF-8): Утиліта для показу/установки параметрів жорстких дисків
Name: hdparm
-Version: 9.61
-Release: 2
+Version: 9.65
+Release: 1
License: BSD
Group: Applications/System
Source0:
https://downloads.sourceforge.net/hdparm/%{name}-%{version}.tar.gz
-# Source0-md5: 3ef06831e83890f0ba48f7a252b93325
+# Source0-md5: 6d6d039d61ec995b1ec72ddce0b1853b
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.8.pl
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdparm.git/commitdiff/55af20ff879cc19f5f07ef4415e53924f9a3f844
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
Error with Discovery Campaign Creation
Hello google ads team, i´m trying to create a discovery campaign, but generate the error: Error with message "The required field was not present.". On field: operations On field: create On field: campaign_bidding_strategy I already tried the available bidding strategies according to the documentation, but then it generates another error for all that I tried: Error with message "The operation is not allowed for the given context.". On field: operations On field: create On field: bidding_strategy I don't know if because it's discovery you have to pass other keys, but I followed the documentation: https://developers.google.com/google-ads/api/docs/discovery/create-campaign?hl=pt-br help me, please -- -- =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~ Also find us on our blog: https://googleadsdeveloper.blogspot.com/ =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~ You received this message because you are subscribed to the Google Groups "AdWords API and Google Ads API Forum" group. To post to this group, send email to adwords-api@googlegroups.com To unsubscribe from this group, send email to adwords-api+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/adwords-api?hl=en --- You received this message because you are subscribed to the Google Groups "Google Ads API and AdWords API Forum" group. To unsubscribe from this group and stop receiving emails from it, send an email to adwords-api+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/adwords-api/a26d5b02-3bea-4e34-9067-736493f91015n%40googlegroups.com.
[petsc-users] Failed to configure on Windows with latest Intel OneAPI
Hi, I failed to configue PETSc on Windows with latest Intel OneAPI toolkit: ./configure --with-cc="win32fe cl" --with-cxx="win32fe cl" --with-fc=0 \ --with-debugging=0 --with-shared-libraries=0 --with-x=0 --with-quad-precision=0 \ --with-threadcomm=1 --with-openmp=1 \ --with-blaslapack-include="$MKLROOT/include" \ --with-blaslapack-lib="-L$MKLROOT/lib/intel64 mkl_core.lib mkl_intel_thread.lib mkl_intel_lp64.lib libiomp5md.lib" \ --with-mpi-include="$I_MPI_ROOT/include" \ --with-mpi-lib="-L$I_MPI_ROOT/lib/release impi.lib" \ --with-mpiexec="$I_MPI_ROOT/bin/mpiexec" \ --ignore-cygwin-link However, the configuration was successful with Intel OneAPI 2022.1.0.93 or previous version. Error message: = Configuring PETSc to compile on your system = = * WARNING * Using default optimization C flags "-O". You might consider manually setting optimal optimization flags for your system with COPTFLAGS="optimization flags" see config/examples/arch-*-opt.py for examples = = * WARNING * Using default Cxx optimization flags "-O". You might consider manually setting optimal optimization flags for your system with CXXOPTFLAGS="optimization flags" see config/examples/arch-*-opt.py for examples = TESTING: checkCxxLibraries from config.compilers(config/BuildSystem/config/compilers.py:450) * UNABLE to CONFIGURE with GIVEN OPTIONS (see configure.log for details): - Cxx libraries cannot directly be used with C as linker. If you don't need the C++ compiler to build external packages or for you application you can run ./configure with --with-cxx=0. Otherwise you need a different combination of C and C++ compilers * makefile:24: /cygdrive/e/petsc-v3.19.2/arch-mswin-c-opt/lib/petsc/conf/petscrules: No such file or directory make[1]: *** No rule to make target '/cygdrive/e/petsc-v3.19.2/arch-mswin-c-opt/lib/petsc/conf/petscrules'. Stop. gmakefile:67: arch-mswin-c-opt/lib/petsc/conf/files: No such file or directory make: *** [GNUmakefile:17: /cygdrive/e/petsc-v3.19.2/arch-mswin-c-opt/include/petscconf.h] Error 2 makefile:24: /cygdrive/e/petsc-v3.19.2/arch-mswin-c-opt/lib/petsc/conf/petscrules: No such file or directory make[1]: *** No rule to make target '/cygdrive/e/petsc-v3.19.2/arch-mswin-c-opt/lib/petsc/conf/petscrules'. Stop. /cygdrive/e/petsc-v3.19.2/lib/petsc/conf/variables:140: /cygdrive/e/petsc-v3.19.2/arch-mswin-c-opt/lib/petsc/conf/petscvariables: No such file or directory make: *** [GNUmakefile:17: /cygdrive/e/petsc-v3.19.2/arch-mswin-c-opt/lib/petsc/conf/petscvariables] Error 2
Re: Run LC on old Mac with Ventura!
If memory serves, the problem with older machines was not running the metal graphical system, as they lacked the hardware. There were some near-contemporaneous patches that allowed at least the first post-mohave osx to run, put were reported as glacially and painfully slow as metal got emulated on older hardware. This says that the patch allows supporter non-metal graphical cards, though—I’m curious how that would work on apple stuff that calls to metal. But, alas, the 2012 iMac isn’t the list, so I guess I’m out of luck anyway. ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: XAVVI and app/code copyright
I’m saying that in the US, it isn’t clear *that* there would be copyright protection for what the AI generated. The current caselaw for patents is that a machine can’t be a creator—but patent and copyright function differently (although I ultimately would expect the same answer for that particular question). The changes made to the AI output would belong to the person that made them, regardless of the other answers. But suppose that the AI output is subject to copyright. If you took that, and changed it, and then someone asked the same or similar question, getting similar code from the AI, that wouldn’t be "derived from” your output from the same question, and thus would be separately eligible for copyright by that person. Merely being identical is *not* a violation of copyright! ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: XAVVI and app/code copyright
paul provided, >Just as livecode script you create now is copywritable, whether you write each >line >by hand or copy some code from a freely available library, the finished >application you > make can be copyrighted by you. Same with Xavvi. This is far less than clear user current US law . . . It’s not my area of law, but I’ve been following case reports, and both the current status and what is likely to change are clear as mud. ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: Am I using the best mail client?
bob belabored, >There was some talk years ago about the practice of only quoting the relevant >body text, and not >every single reply with quote, and reply with quote of reply with quote, and >every reply with >quote of every reply with quote of every reply… That predates this list, and for that matter the creation of NACBA, by decades. For that matter, it predates the word “internet”, and the constant network connection. Ancient etiquette is that it is simply rude (at best) to include entire messages, rather than trimming to the parts to which you are replying. And “top-posting”, placing your response before the message, was the mark of a newbie, and treated harshly. Which worked, until the “Eternal September” of 1993, when rather than once a year with new students, AOL started dumping a continual supply of newbies, faster than they could be assimilated. [in fairness, the infrastructure in the 80s couldn’t handle the load of all that extra text—the backbone got upgraded *to* 56k (bits/second) in the 80s!] ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: Creating 'read only' text files
And just to avoid the brainfreeeze that I’d probably absentmindedly implement: You have to create the file and do all of your writing, and then *change* the file to read only . . . Uihm, err, i never really make mistakes like that, or applying bus voltage to a whole bank of toggle switches, or . . . ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: Weird window behavior
I’ll see your oddity and raise you a weirdness! > On Apr 19, 2023, at 11:29 AM, Craig Newman via use-livecode > wrote: > > Marty. > > No more than I. I lead both the forum and this list for personally directed > oddities. Nobody can touch me… > > Craig > >> On Apr 19, 2023, at 2:25 PM, Marty Knapp via use-livecode >> wrote: >> >> Ever since I updated to Ventura on my Mac I've had this weird behavior both >> in the IDE and in two different standalones - if I have more than one stack >> open, when I click on a stack that is behind another stack to bring it to >> the front, it very briefly comes to the front (flashes), then goes back >> behind everything, even windows from other apps. If I click on the title bar >> it does not do this. In the menubar is still indicates that I'm in my app. >> It's not happening with any non-Livecode apps and it's occurring on two >> different Macs. I’m not seeing this behavior on OSes previous to Ventura. >> >> Am I going crazy? >> >> Marty >> ___ >> use-livecode mailing list >> use-livecode@lists.runrev.com >> Please visit this url to subscribe, unsubscribe and manage your subscription >> preferences: >> http://lists.runrev.com/mailman/listinfo/use-livecode > > > ___ > use-livecode mailing list > use-livecode@lists.runrev.com > Please visit this url to subscribe, unsubscribe and manage your subscription > preferences: > http://lists.runrev.com/mailman/listinfo/use-livecode ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: Which sqlite?
neville noticed, >It is easy enough to install a more capable version of sqlite on the Mac, but >I don’t see a way to get LC to use it. It seems to me that several years ago I briefly used an external SQLite, but I cannot remember how I started with mysql (on livecode’s server, come to think of it, or was it still runrev?), but performance was beyond molasses, as livecode cannot do a compound query on mysql. I shifted to hosting my own postgreSQL, and then (if I have the order straight) switched from an array of variables to the included SQLite for local storage, updating periodically. The problem with trying to use the Mac-supplied databases is that they sometimes change without notice. I started using the internal postgres, and then, one day, my whole system suddenly stopped working. It turned out that apple had changed major postgres releases on a minor maintenance release. And the postgres's weren’t compatible with one another! I had to install an older postgres to export my data, and at that point stayed with running my own postgres. If you’re going to use the built-in, you need to be *very* careful. ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
PLD-doc: uid_gid.db.txt - uid/gid for rrdcached from rrdtools
Author: hawk Date: Mon Mar 6 18:18:29 2023 GMT Module: PLD-doc Tag: HEAD Log message: - uid/gid for rrdcached from rrdtools Files affected: PLD-doc: uid_gid.db.txt (1.415 -> 1.416) Diffs: Index: PLD-doc/uid_gid.db.txt diff -u PLD-doc/uid_gid.db.txt:1.415 PLD-doc/uid_gid.db.txt:1.416 --- PLD-doc/uid_gid.db.txt:1.415Sat Oct 22 08:22:36 2022 +++ PLD-doc/uid_gid.db.txt Mon Mar 6 19:18:24 2023 @@ -379,6 +379,7 @@ 345libstoragemgmt libstoragemgmt 346dkimpy-milter python-dkimpy-milterdkimpy-milter daemon +347rrdcached rrdtool-cached rrdcached daemon 501pykota pykota @@ -736,6 +737,7 @@ 344sgx setup SGX enclaves access 345libstoragemgmt libstoragemgmt 346dkimpy-milter python-dkimpy-milterdkimpy-milter daemon +347rrdcached rrdtool-cached rrdcached daemon 501pykota pykota CVS-web: http://cvs.pld-linux.org/PLD-doc/uid_gid.db.txt?r1=1.415=1.416 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[j-nsp] SRX 3400 IPSec Performance question/advice needed
Hello Community, I was hoping to get some advice on something. I'm doing some tests on an old SRX3400 cluster in our lab and I'm noticing that IPSec performance on the SRX3400 is horrible. As per documentation it talks about 8G - 10G of IPSec performance. I've done tests with 3des-md5, 3des-sha1, aes128-sha1,aes256-sha256. It seems that aes128-sha1, aes256-sha256 perform best, but even in those circumstances the performance is minimal (approximately 150Mbps on the download and about 350Mbps on the upload). I'm doing this test between 2 SRX3400's, I've also done it from a Fortigate 60F to the SRX 3400 and both yield the same results. At first I thought that the SPU wasn't being engaged and that the RE is trying to handle the IPSec but I checked and it seems that there is traffic through the SPU when IPSec traffic is pushed through. I've also enabled ipsec acceleration on the flow (without rebooting the chassis) and it made no difference (not sure if reboot is required). Any suggestions that one can offer me? I speculate that I'm missing some "optimization" command that should engage the ASIC better. PS. I'm running the latest version of the SRX 12.3x48 code. PS2. I am only running 1x SPU in the chassis and I was thinking of maybe installing additional SPUs to see if it helps.. (but based on documentation, a single SPU should handle about 8Gbps of throughput... while adding a second should increase that further). TBH, I'm not looking to do more than 1G... but I wanted to see 1G performance at least. Any help/suggestions are greatly appreciated. Thank you! Adrian ___ juniper-nsp mailing list juniper-nsp@puck.nether.net https://puck.nether.net/mailman/listinfo/juniper-nsp
[packages/userspace-rcu] - revert last commit
commit 27f1398e7241f2f092c30dffd0d39e7489c6905a
Author: Marcin Krol
Date: Fri Feb 10 18:09:21 2023 +0100
- revert last commit
no_examples.patch | 8
userspace-rcu.spec | 11 +--
2 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/userspace-rcu.spec b/userspace-rcu.spec
index fd2ccd0..5612de0 100644
--- a/userspace-rcu.spec
+++ b/userspace-rcu.spec
@@ -7,7 +7,6 @@ License:LGPL v2.1+ (library), GPL v2 (tests)
Group: Libraries
Source0: https://lttng.org/files/urcu/%{name}-%{version}.tar.bz2
# Source0-md5: eecffc78f89938424b328298d76d856f
-Patch0:no_examples.patch
URL: http://liburcu.org/
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,16 +61,12 @@ Statyczne biblioteki Userspace RCU.
%prep
%setup -q
-%patch -p1
%build
-%{__aclocal}
-%{__autoconf} -I m4
-%{__automake}
%configure \
--disable-silent-rules
-%{make}
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -84,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
# packaged as %doc
%{__rm}
$RPM_BUILD_ROOT%{_docdir}/userspace-rcu/{{rcu,cds,uatomic}-api.md,LICENSE,README.md,solaris-build.md}
+install -d $RPM_BUILD_ROOT%{_examplesdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/userspace-rcu/examples
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -138,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/liburcu-memb.pc
%{_pkgconfigdir}/liburcu-qsbr.pc
%{_pkgconfigdir}/liburcu-signal.pc
+%{_examplesdir}/%{name}-%{version}
%files static
%defattr(644,root,root,755)
diff --git a/no_examples.patch b/no_examples.patch
deleted file mode 100644
index 20b5ed1..000
--- a/no_examples.patch
+++ /dev/null
@@ -1,8 +0,0 @@
userspace-rcu-0.13.1/doc/Makefile.am 2023-02-10 18:00:32.314848761
+0100
-+++ userspace-rcu-0.13.1/doc/Makefile.am 2023-02-10 18:00:35.760848972
+0100
-@@ -1,4 +1,4 @@
--SUBDIRS = examples
-+#SUBDIRS = examples
-
- dist_doc_DATA = rcu-api.md \
- cds-api.md \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/userspace-rcu.git/commitdiff/27f1398e7241f2f092c30dffd0d39e7489c6905a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/userspace-rcu] - updated to 0.13.1
commit 7a0c6e5de3870d129b122e0c2b05d939771ddf6b
Author: Marcin Krol
Date: Fri Feb 10 18:07:31 2023 +0100
- updated to 0.13.1
no_examples.patch | 8
userspace-rcu.spec | 11 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/userspace-rcu.spec b/userspace-rcu.spec
index 5612de0..fd2ccd0 100644
--- a/userspace-rcu.spec
+++ b/userspace-rcu.spec
@@ -7,6 +7,7 @@ License:LGPL v2.1+ (library), GPL v2 (tests)
Group: Libraries
Source0: https://lttng.org/files/urcu/%{name}-%{version}.tar.bz2
# Source0-md5: eecffc78f89938424b328298d76d856f
+Patch0:no_examples.patch
URL: http://liburcu.org/
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,12 +62,16 @@ Statyczne biblioteki Userspace RCU.
%prep
%setup -q
+%patch -p1
%build
+%{__aclocal}
+%{__autoconf} -I m4
+%{__automake}
%configure \
--disable-silent-rules
-%{__make}
+%{make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -79,9 +84,6 @@ rm -rf $RPM_BUILD_ROOT
# packaged as %doc
%{__rm}
$RPM_BUILD_ROOT%{_docdir}/userspace-rcu/{{rcu,cds,uatomic}-api.md,LICENSE,README.md,solaris-build.md}
-install -d $RPM_BUILD_ROOT%{_examplesdir}
-%{__mv} $RPM_BUILD_ROOT%{_docdir}/userspace-rcu/examples
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -136,7 +138,6 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/liburcu-memb.pc
%{_pkgconfigdir}/liburcu-qsbr.pc
%{_pkgconfigdir}/liburcu-signal.pc
-%{_examplesdir}/%{name}-%{version}
%files static
%defattr(644,root,root,755)
diff --git a/no_examples.patch b/no_examples.patch
new file mode 100644
index 000..20b5ed1
--- /dev/null
+++ b/no_examples.patch
@@ -0,0 +1,8 @@
+--- userspace-rcu-0.13.1/doc/Makefile.am 2023-02-10 18:00:32.314848761
+0100
userspace-rcu-0.13.1/doc/Makefile.am 2023-02-10 18:00:35.760848972
+0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = examples
++#SUBDIRS = examples
+
+ dist_doc_DATA = rcu-api.md \
+ cds-api.md \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/userspace-rcu.git/commitdiff/7a0c6e5de3870d129b122e0c2b05d939771ddf6b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rpm] - dbus announce plugin is not built when systemd inhibit plugin is disabled
commit c348c94b743526e50584348b062fe2f2fa5700e3
Author: Marcin Krol
Date: Sun Nov 6 17:05:02 2022 +0100
- dbus announce plugin is not built when systemd inhibit plugin is
disabled
rpm.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index bd3974c..1b88b22 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1128,12 +1128,14 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%attr(755,root,root) %{_libdir}/rpm-plugins/fapolicyd.so
%{_mandir}/man8/rpm-plugin-fapolicyd.8*
+%if %{with systemd}
%files plugin-dbus-announce
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/rpm-plugins/dbus_announce.so
%{_mandir}/man8/rpm-plugin-dbus-announce.8*
%{_sysconfdir}/dbus-1/system.d/org.rpm.conf
%endif
+%endif
%files sign
%defattr(644,root,root,755)
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/c348c94b743526e50584348b062fe2f2fa5700e3
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: efibootmgr: efibootmgr-18.tar.bz2
Request by: hawk Files fetched: 1 STORED: https://github.com/rhboot/efibootmgr/releases/download/18/efibootmgr-18.tar.bz2 a92ce8fd2b282fa30f066797b14095ef efibootmgr-18.tar.bz2 Size: 40439 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/efibootmgr] - updated to 18
commit 2f26dd9694621105b669a4a519fa8a7c18c3dc11
Author: Marcin Krol
Date: Wed Aug 31 22:10:52 2022 +0200
- updated to 18
efibootmgr.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/efibootmgr.spec b/efibootmgr.spec
index 8c5089e..3209fa3 100644
--- a/efibootmgr.spec
+++ b/efibootmgr.spec
@@ -1,13 +1,13 @@
Summary: EFI Boot Manager
Summary(pl.UTF-8): Boot Manager dla EFI
Name: efibootmgr
-Version: 16
+Version: 18
Release: 1
License: GPL v2+
Group: Base
#Source0Download: https://github.com/rhboot/efibootmgr/releases
Source0:
https://github.com/rhboot/efibootmgr/releases/download/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: ab7cf46774fda951a0e8a40beb65a90e
+# Source0-md5: a92ce8fd2b282fa30f066797b14095ef
URL: https://github.com/rhboot/efibootmgr
BuildRequires: efivar-devel >= 30
BuildRequires: popt-devel
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/efibootmgr.git/commitdiff/2f26dd9694621105b669a4a519fa8a7c18c3dc11
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/bison] - bcond R: libtextstyle too, disable looking for libtexstyle if no libtextyle was requested
commit 575c0706845c40b004159c14667eb2331ff73ef1
Author: Marcin Krol
Date: Sun Aug 28 12:42:41 2022 +0200
- bcond R: libtextstyle too, disable looking for libtexstyle if
no libtextyle was requested
bison.spec| 8 +++-
no_libtextstyle.patch | 21 +
2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/bison.spec b/bison.spec
index 928384d..8723b89 100644
--- a/bison.spec
+++ b/bison.spec
@@ -17,6 +17,7 @@ Source0:
https://ftp.gnu.org/gnu/bison/%{name}-%{version}.tar.lz
# Source0-md5: 26e76218c2a50a0dd307286d42eb0af9
Source1: %{name}.1.pl
Patch0:%{name}-info.patch
+Patch1:no_libtextstyle.patch
URL: http://www.gnu.org/software/bison/
BuildRequires: flex
BuildRequires: gcc >= 5:3.2
@@ -31,7 +32,7 @@ BuildRequires:rpmbuild(find_lang) >= 1.31
BuildRequires: tar >= 1:1.22
BuildRequires: texinfo >= 4.0
Requires: %{name}-runtime = %{version}-%{release}
-Requires: libtextstyle >= 0.20.5
+%{?with_libtextstyle:Requires: libtextstyle >= 0.20.5}
Requires: m4 >= 1.4.6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -107,10 +108,15 @@ zawierajacych parsery wygenerowane przez bisona.
%prep
%setup -q
%patch0 -p1
+%{!?with_libtextstyle:%patch1 -p1}
%{__rm} po/stamp-po
%build
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
--disable-silent-rules
%{__make}
diff --git a/no_libtextstyle.patch b/no_libtextstyle.patch
new file mode 100644
index 000..d5aa64b
--- /dev/null
+++ b/no_libtextstyle.patch
@@ -0,0 +1,21 @@
+diff -ur bison-3.8.2.orig/m4/libtextstyle-optional.m4
bison-3.8.2/m4/libtextstyle-optional.m4
+--- bison-3.8.2.orig/m4/libtextstyle-optional.m4 2021-03-10
06:41:25.0 +0100
bison-3.8.2/m4/libtextstyle-optional.m42022-08-28 12:38:58.097300031
+0200
+@@ -21,14 +21,9 @@
+
+ AC_DEFUN([gl_LIBTEXTSTYLE_OPTIONAL],
+ [
+- gl_LIBTEXTSTYLE([$1])
+- if test $HAVE_LIBTEXTSTYLE = yes; then
+-TEXTSTYLE_H=
+- else
+-TEXTSTYLE_H=textstyle.h
+-AC_REQUIRE([AC_C_INLINE])
+-AC_CHECK_FUNCS_ONCE([tcdrain])
+- fi
++ TEXTSTYLE_H=textstyle.h
++ AC_REQUIRE([AC_C_INLINE])
++ AC_CHECK_FUNCS_ONCE([tcdrain])
+ AC_SUBST([TEXTSTYLE_H])
+ AM_CONDITIONAL([GL_GENERATE_TEXTSTYLE_H], [test -n "$TEXTSTYLE_H"])
+ ])
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/bison.git/commitdiff/575c0706845c40b004159c14667eb2331ff73ef1
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/bison] - added bcond to allow building without requiring libtextstyle which is optional
commit 8288f3a384832bd5088661c9e2b5eb8d60f02f6b
Author: Marcin Krol
Date: Sun Aug 28 11:57:42 2022 +0200
- added bcond to allow building without requiring libtextstyle which is
optional
bison.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/bison.spec b/bison.spec
index c26ab08..928384d 100644
--- a/bison.spec
+++ b/bison.spec
@@ -1,3 +1,4 @@
+%bcond_without libtextstyle# don't require libtextstyle
Summary: A GNU general-purpose parser generator
Summary(de.UTF-8): GNU-Parser-Generator
Summary(es.UTF-8): Generador de parser de la GNU
@@ -21,7 +22,7 @@ BuildRequires:flex
BuildRequires: gcc >= 5:3.2
BuildRequires: gettext-tools >= 0.19
BuildRequires: help2man
-BuildRequires: libtextstyle-devel >= 0.20.5
+%{?with_libtextstyle:BuildRequires:libtextstyle-devel >= 0.20.5}
BuildRequires: libxslt-progs
BuildRequires: lzip
BuildRequires: m4 >= 1.4.6
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/bison.git/commitdiff/8288f3a384832bd5088661c9e2b5eb8d60f02f6b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
Re: Livecode performance problem
Short version: inserting between is a much slower process than after, as the entire field/string/whatever from the post of insertion has to be moved or otherwise handled. ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
[Nighthawk Lovers] Re: 85 NH 700 clutch quuestion, and an exhaust interchangeability question.
Greetings, One of the first 2 things I had to do with my 700S after getting it was, replace both front and rear tires as well as replacing the clutch plates & springs! Then had to replace the cables shortly after, both clutch and front brake! Knock on wood, never touched the slave in it and she's been doing great ever since! All the best to ya William, geo. on Virginia On Friday, August 12, 2022 at 1:32:13 PM UTC-4 wilm...@gmail.com wrote: > Hello All, > just under a month ago, I posted a question about "my poor clutch", to > which Bernie and Mike kindly replied to. > Finally just watched the great youtube video on the slave cylinder > rebuild... > My question is, can the slave cylinder be causing my clutch slippage? > Forgive my ignorance! > > Exhaust questions, > I've always preferred the chrome pipes on the 83-85(?) NH 650 to the black > finish pipes on mine... > Question, will those pipes easily bolt on the 85 NH 700, and if so, does > anyone know where to find them? > > Thanks, William b. > > -- You received this message because you are subscribed to the Google Groups "Nighthawk Motorcycle Lovers!" group. To unsubscribe from this group and stop receiving emails from it, send an email to nighthawk_lovers+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/nighthawk_lovers/d6f770ff-debb-4fb4-b4b6-752ec3f3a326n%40googlegroups.com.
Can't activate indy license on 10.0
I finally dropped my business subscription that I never used, but I have a lifetime indy license. The 10.0 installer, however, isn’t asking which license I want to use, but instead tells me that my license expired. Am I missing something here? ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
[packages/php-pear-Archive_Tar] - release 2
commit 787099dfce89761b85a2969afd884a848b7e
Author: Marcin Krol
Date: Mon Jun 13 21:09:03 2022 +0200
- release 2
php-pear-Archive_Tar.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php-pear-Archive_Tar.spec b/php-pear-Archive_Tar.spec
index 0e6ec26..69252bc 100644
--- a/php-pear-Archive_Tar.spec
+++ b/php-pear-Archive_Tar.spec
@@ -8,7 +8,7 @@ Summary:%{pearname} - Tar file management class
Summary(pl.UTF-8): %{pearname} - klasa do zarządzania plikami Tar
Name: php-pear-%{pearname}
Version: 1.4.14
-Release: 1
+Release: 2
License: New BSD
Group: Development/Languages/PHP
Source0: http://pear.php.net/get/%{pearname}-%{version}.tgz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pear-Archive_Tar.git/commitdiff/787099dfce89761b85a2969afd884a848b7e
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php-pear-Archive_Tar] - updated to 1.4.14
commit 5586e734bbf3708e275fc98b3084fdf76405ea56
Author: Marcin Krol
Date: Mon Jun 13 18:14:29 2022 +0200
- updated to 1.4.14
php-pear-Archive_Tar.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/php-pear-Archive_Tar.spec b/php-pear-Archive_Tar.spec
index ac7ef0b..0e6ec26 100644
--- a/php-pear-Archive_Tar.spec
+++ b/php-pear-Archive_Tar.spec
@@ -7,12 +7,12 @@
Summary: %{pearname} - Tar file management class
Summary(pl.UTF-8): %{pearname} - klasa do zarządzania plikami Tar
Name: php-pear-%{pearname}
-Version: 1.4.9
+Version: 1.4.14
Release: 1
License: New BSD
Group: Development/Languages/PHP
Source0: http://pear.php.net/get/%{pearname}-%{version}.tgz
-# Source0-md5: 55d09b767bfaff475cfc99432d69856d
+# Source0-md5: 12c9b5f0e0f2e875c332cc3908659017
URL: http://pear.php.net/package/Archive_Tar/
%if %{without bootstrap}
BuildRequires: php-pear-PEAR
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pear-Archive_Tar.git/commitdiff/5586e734bbf3708e275fc98b3084fdf76405ea56
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
Re: storing binary data in a "memory" database
A couple of lines of code with declarations, storing, and retrieving would probably help. There also might be a UTF issue (which would be beyond me)—a hash should be in good old 6.5 bit ASCII, not something newfangled with eight or more bits. ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
Re: storing binary data in a "memory" database
bob bobbled, > How should I define a column in sqLite that is going to properly store and > retrieve a password hash? Simply using a BLOB type doesn't do it. You shouldn’t need a BLOB for a hash. Either CHAR(), VARCHAR(), or TEXT. With the first two, you need to specify a long enough length. ___ use-livecode mailing list use-livecode@lists.runrev.com Please visit this url to subscribe, unsubscribe and manage your subscription preferences: http://lists.runrev.com/mailman/listinfo/use-livecode
[packages/python-dkimpy-milter] - fixed typo in filename
commit a8bb7445459a638376c43f736debe4cf94e84242
Author: Marcin Krol
Date: Mon May 30 02:57:16 2022 +0200
- fixed typo in filename
python-dkimpy-milter.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/python-dkimpy-milter.spec b/python-dkimpy-milter.spec
index 1941784..6bdf905 100644
--- a/python-dkimpy-milter.spec
+++ b/python-dkimpy-milter.spec
@@ -87,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/{dkimpy-milter/keys,rc.d/init.d},/usr/sbin}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dkimpy-milter
-touch $RPM_BUILD_ROOT/etc/dkimpy-milter/{KeyTable,KeyTablEed25519,SigningTable}
+touch $RPM_BUILD_ROOT/etc/dkimpy-milter/{KeyTable,KeyTableEd25519,SigningTable}
%if %{with python2}
%py_install
@@ -153,7 +153,7 @@ fi
%doc README.md CHANGES
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/dkimpy-milter.conf
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTable
-%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTablEed25519
+%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTableEd25519
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/SigningTable
%dir %attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter
%dir %attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter/keys
@@ -171,7 +171,7 @@ fi
%doc README.md CHANGES
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/dkimpy-milter.conf
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTable
-%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTablEed25519
+%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTableEd25519
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/SigningTable
%dir %attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter
%dir %attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter/keys
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/a8bb7445459a638376c43f736debe4cf94e84242
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - fix /etc/dkimpy-milter dirs
commit 192ab88c52dd40396ad9b533243c49c6d46dbf06
Author: Marcin Krol
Date: Mon May 30 00:01:18 2022 +0200
- fix /etc/dkimpy-milter dirs
python-dkimpy-milter.spec | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/python-dkimpy-milter.spec b/python-dkimpy-milter.spec
index 0c28064..1941784 100644
--- a/python-dkimpy-milter.spec
+++ b/python-dkimpy-milter.spec
@@ -155,7 +155,8 @@ fi
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTable
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTablEed25519
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/SigningTable
-%attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter/keys
+%dir %attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter
+%dir %attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter/keys
%attr(754,root,root) /etc/rc.d/init.d/dkimpy-milter
%attr(755,root,root) %{_sbindir}/dkimpy-milter
%{_mandir}/man5/dkimpy-milter.conf.5*
@@ -172,7 +173,8 @@ fi
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTable
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTablEed25519
%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/SigningTable
-%attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter/keys
+%dir %attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter
+%dir %attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter/keys
%attr(754,root,root) /etc/rc.d/init.d/dkimpy-milter
%attr(755,root,root) %{_sbindir}/dkimpy-milter
%{_mandir}/man5/dkimpy-milter.conf.5*
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/192ab88c52dd40396ad9b533243c49c6d46dbf06
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - seems to work
commit 2aa57614ab9a5e74be46b1c9be1107b957707c07
Author: Marcin Krol
Date: Sun May 29 23:47:50 2022 +0200
- seems to work
python-dkimpy-milter.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/python-dkimpy-milter.spec b/python-dkimpy-milter.spec
index 442982c..0c28064 100644
--- a/python-dkimpy-milter.spec
+++ b/python-dkimpy-milter.spec
@@ -16,7 +16,7 @@
Summary: DKIM signing and verification milter
Name: python-%{module}
Version: 1.2.2
-Release: 0.6
+Release: 1
License: BSD-like
Group: Libraries/Python
Source0:
https://files.pythonhosted.org/packages/source/d/dkimpy-milter/%{module}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/2aa57614ab9a5e74be46b1c9be1107b957707c07
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - use .socket for unix socket like in other milters
commit 504d7d8d7b0f7238023b6b1dce1b7c9e8f290157 Author: Marcin Krol Date: Sun May 29 23:18:32 2022 +0200 - use .socket for unix socket like in other milters config.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/config.patch b/config.patch index 44e1877..55d7158 100644 --- a/config.patch +++ b/config.patch @@ -1,6 +1,6 @@ diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf dkimpy-milter-1.2.2/etc/dkimpy-milter.conf --- dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf2022-05-29 21:57:00.932051546 +0200 -+++ dkimpy-milter-1.2.2/etc/dkimpy-milter.conf 2022-05-29 22:45:43.738141589 +0200 dkimpy-milter-1.2.2/etc/dkimpy-milter.conf 2022-05-29 23:18:10.535143906 +0200 @@ -1,48 +1,45 @@ -# This is a basic configuration that can easily be adapted to suit a standard -# installation. For more advanced options, see dkimpy-milter.conf(5). @@ -73,7 +73,7 @@ diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf dkimpy-milter-1.2.2/etc +# inet:port to listen on all interfaces +# local:/path/to/socket to listen on a UNIX domain socket +# -+#Socket local:/var/spool/postfix/dkimpy/dkimpy-milter.sock ++#Socket local:/var/spool/postfix/dkimpy/dkimpy-milter.socket +Socketinet:8892@localhost + +# Path to key tables and signing table gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/504d7d8d7b0f7238023b6b1dce1b7c9e8f290157 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - do not enable tables by default, empty tables will prevent daemon from starting
commit fadadace4e0513aa4142ef86d7831bfcd803e8b2 Author: Marcin Krol Date: Sun May 29 22:45:58 2022 +0200 - do not enable tables by default, empty tables will prevent daemon from starting config.patch | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/config.patch b/config.patch index 938bab7..44e1877 100644 --- a/config.patch +++ b/config.patch @@ -1,6 +1,6 @@ diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf dkimpy-milter-1.2.2/etc/dkimpy-milter.conf --- dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf2022-05-29 21:57:00.932051546 +0200 -+++ dkimpy-milter-1.2.2/etc/dkimpy-milter.conf 2022-05-29 22:23:32.664366219 +0200 dkimpy-milter-1.2.2/etc/dkimpy-milter.conf 2022-05-29 22:45:43.738141589 +0200 @@ -1,48 +1,45 @@ -# This is a basic configuration that can easily be adapted to suit a standard -# installation. For more advanced options, see dkimpy-milter.conf(5). @@ -77,9 +77,9 @@ diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf dkimpy-milter-1.2.2/etc +Socketinet:8892@localhost + +# Path to key tables and signing table -+KeyTable /etc/dkimpy-milter/KeyTable -+KeyTableEd25519 /etc/dkimpy-milter/KeyTablEed25519 -+SigningTable /etc/dkimpy-milter/SigningTable ++#KeyTable /etc/dkimpy-milter/KeyTable ++#KeyTableEd25519 /etc/dkimpy-milter/KeyTablEed25519 ++#SigningTable /etc/dkimpy-milter/SigningTable + +# Milter macros telling us what to do (sign or verify) +MacroList daemon_name|ORIGINATING gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/fadadace4e0513aa4142ef86d7831bfcd803e8b2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - config files/dirs owned by dkimpy-milter user/group - provide empty key and signing table files
commit e2282371e03ce290701084b55f729d4dd49be129
Author: Marcin Krol
Date: Sun May 29 22:39:03 2022 +0200
- config files/dirs owned by dkimpy-milter user/group
- provide empty key and signing table files
python-dkimpy-milter.spec | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/python-dkimpy-milter.spec b/python-dkimpy-milter.spec
index 796c072..442982c 100644
--- a/python-dkimpy-milter.spec
+++ b/python-dkimpy-milter.spec
@@ -16,7 +16,7 @@
Summary: DKIM signing and verification milter
Name: python-%{module}
Version: 1.2.2
-Release: 0.5
+Release: 0.6
License: BSD-like
Group: Libraries/Python
Source0:
https://files.pythonhosted.org/packages/source/d/dkimpy-milter/%{module}-%{version}.tar.gz
@@ -87,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/{dkimpy-milter/keys,rc.d/init.d},/usr/sbin}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dkimpy-milter
+touch $RPM_BUILD_ROOT/etc/dkimpy-milter/{KeyTable,KeyTablEed25519,SigningTable}
%if %{with python2}
%py_install
@@ -150,8 +151,11 @@ fi
%files
%defattr(644,root,root,755)
%doc README.md CHANGES
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/dkimpy-milter/dkimpy-milter.conf
-%dir /etc/dkimpy-milter/keys
+%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/dkimpy-milter.conf
+%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTable
+%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTablEed25519
+%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/SigningTable
+%attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter/keys
%attr(754,root,root) /etc/rc.d/init.d/dkimpy-milter
%attr(755,root,root) %{_sbindir}/dkimpy-milter
%{_mandir}/man5/dkimpy-milter.conf.5*
@@ -164,8 +168,11 @@ fi
%files -n python3-%{module}
%defattr(644,root,root,755)
%doc README.md CHANGES
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/dkimpy-milter/dkimpy-milter.conf
-%dir /etc/dkimpy-milter/keys
+%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/dkimpy-milter.conf
+%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTable
+%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/KeyTablEed25519
+%attr(640,dkimpy-milter,dkimpy-milter) %config(noreplace) %verify(not md5
mtime size) /etc/dkimpy-milter/SigningTable
+%attr(750,dkimpy-milter,dkimpy-milter) /etc/dkimpy-milter/keys
%attr(754,root,root) /etc/rc.d/init.d/dkimpy-milter
%attr(755,root,root) %{_sbindir}/dkimpy-milter
%{_mandir}/man5/dkimpy-milter.conf.5*
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/e2282371e03ce290701084b55f729d4dd49be129
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - add/remove daemon user/group
commit 806affbdf7997937091e86d669567d78e334d6d4
Author: Marcin Krol
Date: Sun May 29 22:30:14 2022 +0200
- add/remove daemon user/group
python-dkimpy-milter.spec | 20
1 file changed, 20 insertions(+)
---
diff --git a/python-dkimpy-milter.spec b/python-dkimpy-milter.spec
index 3445015..796c072 100644
--- a/python-dkimpy-milter.spec
+++ b/python-dkimpy-milter.spec
@@ -106,20 +106,40 @@ install %{SOURCE1}
$RPM_BUILD_ROOT/etc/rc.d/init.d/dkimpy-milter
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+%groupadd -g 346 dkimpy-milter
+%useradd -u 346 -d /usr/share/empty -g dkimpy-milter -c "dkimpy-milter daemon
user" dkimpy-milter
+
%post
/sbin/chkconfig --add dkimpy-milter
%service dkimpy-milter restart
+%postun
+if [ "$1" = "0" ]; then
+ %userremove dkimpy-milter
+ %groupremove dkimpy-milter
+fi
+
%preun
if [ "$1" = "0" ]; then
%service dkimpy-milter stop
/sbin/chkconfig --del dkimpy-milter
fi
+%pre -n python3-%{module}
+%groupadd -g 346 dkimpy-milter
+%useradd -u 346 -d /usr/share/empty -g dkimpy-milter -c "dkimpy-milter daemon
user" dkimpy-milter
+
%post -n python3-%{module}
/sbin/chkconfig --add dkimpy-milter
%service dkimpy-milter restart
+%postun -n python3-%{module}
+if [ "$1" = "0" ]; then
+ %userremove dkimpy-milter
+ %groupremove dkimpy-milter
+fi
+
%preun -n python3-%{module}
if [ "$1" = "0" ]; then
%service dkimpy-milter stop
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/e2282371e03ce290701084b55f729d4dd49be129
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - more complete config
commit 87c5612a70f95316a9b2ef2c52bb87123e6a941f
Author: Marcin Krol
Date: Sun May 29 22:25:00 2022 +0200
- more complete config
config.patch | 86 +++
python-dkimpy-milter.spec | 2 ++
2 files changed, 88 insertions(+)
---
diff --git a/python-dkimpy-milter.spec b/python-dkimpy-milter.spec
index 9996b16..3445015 100644
--- a/python-dkimpy-milter.spec
+++ b/python-dkimpy-milter.spec
@@ -23,6 +23,7 @@ Source0:
https://files.pythonhosted.org/packages/source/d/dkimpy-milter/%{module
# Source0-md5: dc0f054bc7dc6178eb31f20d93b73cca
Source1: dkimpy-milter.init
Patch0:paths.patch
+Patch1:config.patch
URL: https://launchpad.net/dkimpy-milter
%if %{with python2}
BuildRequires: python-modules >= 1:2.5
@@ -70,6 +71,7 @@ DKIM signing and verification milter
%prep
%setup -q -n %{module}-%{version}
%patch0 -p1
+%patch1 -p1
%build
%if %{with python2}
diff --git a/config.patch b/config.patch
new file mode 100644
index 000..938bab7
--- /dev/null
+++ b/config.patch
@@ -0,0 +1,86 @@
+diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf
dkimpy-milter-1.2.2/etc/dkimpy-milter.conf
+--- dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf2022-05-29
21:57:00.932051546 +0200
dkimpy-milter-1.2.2/etc/dkimpy-milter.conf 2022-05-29 22:23:32.664366219
+0200
+@@ -1,48 +1,45 @@
+-# This is a basic configuration that can easily be adapted to suit a standard
+-# installation. For more advanced options, see dkimpy-milter.conf(5).
++# Name of the file where the filter should write its pid before beginning
++# normal operations.
++PidFile /var/run/dkimpy-milter.pid
++
++# Run as user, may include a group as well, separated from the userid by
++# a colon.
++UserIDdkimpy-milter:postfix
+
+ # Log to syslog
+ Syslogyes
+
++# Syslog facility
++SyslogFacilitymail
++
++# Log successfull signing and verification
++SyslogSuccess yes
++
+ # Required to use local socket with MTAs that access the socket as a non-
+ # privileged user (e.g. Postfix)
+ UMask 007
+
+-# Sign for example.com with key in /etc/dkimpy-milter/dkim.key using
+-# selector '2007' (e.g. 2007._domainkey.example.com)
+-#Domain example.com
+-#KeyFile /etc/dkimpy-milter/example.com.key
+-#Selector default
+-
+-# Commonly-used options; the commented-out versions show the defaults.
+-#Canonicalization relaxed/simple
+-#Mode sv
+-
+-# ## Socket socketspec
+-# ##
+-# ## Names the socket where this filter should listen for milter connections
+-# ## from the MTA. Required. Should be in one of these forms:
+-# ##
+-# ## inet:port@address to listen on a specific interface
+-# ## inet:port to listen on all interfaces
+-# ## local:/path/to/socket to listen on a UNIX domain socket
+-#
+-#Socket local:/var/spool/postfix/dkimpy/dkimpy-milter.sock
+-#
+-#Socket inet:8892@localhost
++# Operating mode
++Mode sv
+
+-## PidFile filename
+-### default /var/run/dkimpy-milter.pid
+-###
+-### Name of the file where the filter should write its pid before beginning
+-### normal operations.
+-#
+-PidFile /var/run/dkimpy-milter.pid
++# Canonicalization method(s) to be used when signing
++Canonicalization relaxed/simple
+
+-## Userid userid
+-### default dkimpy-milter
+-###
+-### Change to user "userid" before starting normal operation? May include
+-### a group ID as well, separated from the userid by a colon.
++# Names the socket where this filter should listen for milter connections
++# from the MTA. Required. Should be in one of these forms:
+ #
+-UserIDdkimpy-milter
++# inet:port@address to listen on a specific interface
++# inet:port to listen on all interfaces
++# local:/path/to/socket to listen on a UNIX domain socket
++#
++#Socket local:/var/spool/postfix/dkimpy/dkimpy-milter.sock
++Socketinet:8892@localhost
++
++# Path to key tables and signing table
++KeyTable /etc/dkimpy-milter/KeyTable
++KeyTableEd25519 /etc/dkimpy-milter/KeyTablEed25519
++SigningTable /etc/dkimpy-milter/SigningTable
++
++# Milter macros telling us what to do (sign or verify)
++MacroList daemon_name|ORIGINATING
++MacroListVerify daemon_name|VERIFYING
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/e2282371e03ce290701084b55f729d4dd49be129
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - alter only paths with this patch, don't touch config
commit 954605e043db8c9aa45bc18ff1308b6f6e8d3eb3
Author: Marcin Krol
Date: Sun May 29 22:23:59 2022 +0200
- alter only paths with this patch, don't touch config
paths.patch | 27 ---
1 file changed, 4 insertions(+), 23 deletions(-)
---
diff --git a/paths.patch b/paths.patch
index e965d53..8c1f855 100644
--- a/paths.patch
+++ b/paths.patch
@@ -1,18 +1,6 @@
-diff -ur dkimpy-milter-1.2.2.orig/dkimpy_milter/config.py
dkimpy-milter-1.2.2/dkimpy_milter/config.py
dkimpy-milter-1.2.2.orig/dkimpy_milter/config.py 2020-04-09
04:49:44.0 +0200
-+++ dkimpy-milter-1.2.2/dkimpy_milter/config.py2022-05-29
14:34:43.873562747 +0200
-@@ -42,7 +42,7 @@
- 'MinimumKeyBits': 1024,
- 'Socket': None,
- 'PidFile': None,
--'UserID': 'dkimpy-milter',
-+'UserID': 'nobody',
- 'Canonicalization': 'relaxed/simple',
- 'InternalHosts': '127.0.0.1',
- 'IntHosts': False,
diff -ur dkimpy-milter-1.2.2.orig/dkimpy_milter/__init__.py
dkimpy-milter-1.2.2/dkimpy_milter/__init__.py
--- dkimpy-milter-1.2.2.orig/dkimpy_milter/__init__.py 2020-08-09
20:15:48.0 +0200
-+++ dkimpy-milter-1.2.2/dkimpy_milter/__init__.py 2022-05-29
13:50:24.310772566 +0200
dkimpy-milter-1.2.2/dkimpy_milter/__init__.py 2022-05-29
21:56:43.077013869 +0200
@@ -451,7 +451,7 @@
def main():
# Ugh, but there's no easy way around this.
@@ -33,7 +21,7 @@ diff -ur dkimpy-milter-1.2.2.orig/dkimpy_milter/__init__.py
dkimpy-milter-1.2.2/
syslog.syslog('dkimpy-milter starting:{0} user:{1}'
diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf
dkimpy-milter-1.2.2/etc/dkimpy-milter.conf
--- dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf2020-04-09
04:49:44.0 +0200
-+++ dkimpy-milter-1.2.2/etc/dkimpy-milter.conf 2022-05-29 14:35:27.503655350
+0200
dkimpy-milter-1.2.2/etc/dkimpy-milter.conf 2022-05-29 21:57:00.932051546
+0200
@@ -8,10 +8,10 @@
# privileged user (e.g. Postfix)
UMask 007
@@ -47,7 +35,7 @@ diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf
dkimpy-milter-1.2.2/etc
#Selector default
# Commonly-used options; the commented-out versions show the defaults.
-@@ -27,17 +27,18 @@
+@@ -27,17 +27,17 @@
# ## inet:port to listen on all interfaces
# ## local:/path/to/socket to listen on a UNIX domain socket
#
@@ -55,7 +43,6 @@ diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf
dkimpy-milter-1.2.2/etc
+#Socket local:/var/spool/postfix/dkimpy/dkimpy-milter.sock
#
#Socket inet:8892@localhost
-+Socket inet:8892@localhost
## PidFile filename
-### default /run/dkimpy-milter/dkimpy-milter.pid
@@ -69,15 +56,9 @@ diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf
dkimpy-milter-1.2.2/etc
## Userid userid
### default dkimpy-milter
-@@ -45,4 +46,4 @@
- ### Change to user "userid" before starting normal operation? May include
- ### a group ID as well, separated from the userid by a colon.
- #
--UserIDdkimpy-milter
-+UserIDnobody:postfix
diff -ur dkimpy-milter-1.2.2.orig/setup.py dkimpy-milter-1.2.2/setup.py
--- dkimpy-milter-1.2.2.orig/setup.py 2020-08-09 20:16:23.0 +0200
-+++ dkimpy-milter-1.2.2/setup.py 2022-05-29 13:28:25.815906789 +0200
dkimpy-milter-1.2.2/setup.py 2022-05-29 21:56:43.077013869 +0200
@@ -32,17 +32,17 @@
class FileMacroExpand(distutils.cmd.Command):
description = "Expand @@ variables in input files, simlar to make macros."
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/e2282371e03ce290701084b55f729d4dd49be129
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PLD-doc: uid_gid.db.txt - uid/gid for dkimpy-milter daemon
Author: hawk Date: Sun May 29 19:54:47 2022 GMT Module: PLD-doc Tag: HEAD Log message: - uid/gid for dkimpy-milter daemon Files affected: PLD-doc: uid_gid.db.txt (1.413 -> 1.414) Diffs: Index: PLD-doc/uid_gid.db.txt diff -u PLD-doc/uid_gid.db.txt:1.413 PLD-doc/uid_gid.db.txt:1.414 --- PLD-doc/uid_gid.db.txt:1.413Fri Apr 29 07:46:02 2022 +++ PLD-doc/uid_gid.db.txt Sun May 29 21:54:42 2022 @@ -378,6 +378,7 @@ 343greetd-greeter greetd greetd greeter user 345libstoragemgmt libstoragemgmt +346dkimpy-milter python-dkimpy-milterdkimpy-milter daemon 501pykota pykota @@ -734,6 +735,7 @@ 343i2c setup group for devices attached to I2C bus 344sgx setup SGX enclaves access 345libstoragemgmt libstoragemgmt +346dkimpy-milter python-dkimpy-milterdkimpy-milter daemon 501pykota pykota CVS-web: http://cvs.pld-linux.org/PLD-doc/uid_gid.db.txt?r1=1.413=1.414 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - directory for keys
commit 75c9d17640e74548f3a30845d85ae419b59c8ab9
Author: Marcin Krol
Date: Sun May 29 20:27:59 2022 +0200
- directory for keys
python-dkimpy-milter.spec | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/python-dkimpy-milter.spec b/python-dkimpy-milter.spec
index cbd9a83..9996b16 100644
--- a/python-dkimpy-milter.spec
+++ b/python-dkimpy-milter.spec
@@ -16,7 +16,7 @@
Summary: DKIM signing and verification milter
Name: python-%{module}
Version: 1.2.2
-Release: 0.4
+Release: 0.5
License: BSD-like
Group: Libraries/Python
Source0:
https://files.pythonhosted.org/packages/source/d/dkimpy-milter/%{module}-%{version}.tar.gz
@@ -83,7 +83,7 @@ DKIM signing and verification milter
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{dkimpy-milter,rc.d/init.d},/usr/sbin}
+install -d $RPM_BUILD_ROOT{/etc/{dkimpy-milter/keys,rc.d/init.d},/usr/sbin}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dkimpy-milter
%if %{with python2}
@@ -129,6 +129,7 @@ fi
%defattr(644,root,root,755)
%doc README.md CHANGES
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/dkimpy-milter/dkimpy-milter.conf
+%dir /etc/dkimpy-milter/keys
%attr(754,root,root) /etc/rc.d/init.d/dkimpy-milter
%attr(755,root,root) %{_sbindir}/dkimpy-milter
%{_mandir}/man5/dkimpy-milter.conf.5*
@@ -142,6 +143,7 @@ fi
%defattr(644,root,root,755)
%doc README.md CHANGES
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/dkimpy-milter/dkimpy-milter.conf
+%dir /etc/dkimpy-milter/keys
%attr(754,root,root) /etc/rc.d/init.d/dkimpy-milter
%attr(755,root,root) %{_sbindir}/dkimpy-milter
%{_mandir}/man5/dkimpy-milter.conf.5*
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/75c9d17640e74548f3a30845d85ae419b59c8ab9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - take care of stale pid files, daemon requires fork
commit 9f1adb0c02cb8172770f1eb639046f87bf76b2dc
Author: Marcin Krol
Date: Sun May 29 20:16:05 2022 +0200
- take care of stale pid files, daemon requires fork
dkimpy-milter.init | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/dkimpy-milter.init b/dkimpy-milter.init
index ce24462..3f6c882 100644
--- a/dkimpy-milter.init
+++ b/dkimpy-milter.init
@@ -30,9 +30,6 @@ else
exit 0
fi
-# Get service config - may override defaults
-[ -f /etc/sysconfig/dkimpy-milter ] && . /etc/sysconfig/dkimpy-milter
-
start() {
# Check if the service is already running?
if [ -f /var/lock/subsys/dkimpy-milter ]; then
@@ -40,8 +37,16 @@ start() {
return
fi
+ # Clean up stale pid file
+ if [ -f /var/run/dkimpy-milter.pid ]; then
+ pid=`cat /var/run/dkimpy-milter.pid`
+ if ! ps -p "$pid" >/dev/null 2>&1; then
+ rm -f /var/run/dkimpy-milter.pid
+ fi
+ fi
+
msg_starting "DKIM Milter"
- daemon /usr/sbin/dkimpy-milter
+ daemon --fork /usr/sbin/dkimpy-milter
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dkimpy-milter
}
@@ -55,7 +60,7 @@ stop() {
# Stop daemons.
msg_stopping "DKIM Milter"
killproc dkimpy-milter
- rm -f /var/lock/subsys/dkimpy-milter
+ rm -f /var/lock/subsys/dkimpy-milter /var/run/dkimpy-milter.pid
}
condrestart() {
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/9f1adb0c02cb8172770f1eb639046f87bf76b2dc
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - put binary in /sbin like other milters
commit 24e59a7bb573631229eba4aef5fa3793fa931006
Author: Marcin Krol
Date: Sun May 29 16:24:43 2022 +0200
- put binary in /sbin like other milters
python-dkimpy-milter.spec | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/python-dkimpy-milter.spec b/python-dkimpy-milter.spec
index 90566c6..cbd9a83 100644
--- a/python-dkimpy-milter.spec
+++ b/python-dkimpy-milter.spec
@@ -16,7 +16,7 @@
Summary: DKIM signing and verification milter
Name: python-%{module}
Version: 1.2.2
-Release: 0.3
+Release: 0.4
License: BSD-like
Group: Libraries/Python
Source0:
https://files.pythonhosted.org/packages/source/d/dkimpy-milter/%{module}-%{version}.tar.gz
@@ -83,7 +83,7 @@ DKIM signing and verification milter
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{dkimpy-milter,rc.d/init.d}
+install -d $RPM_BUILD_ROOT{/etc/{dkimpy-milter,rc.d/init.d},/usr/sbin}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dkimpy-milter
%if %{with python2}
@@ -99,6 +99,7 @@ install %{SOURCE1}
$RPM_BUILD_ROOT/etc/rc.d/init.d/dkimpy-milter
%endif
%{__mv} $RPM_BUILD_ROOT/usr/etc/dkimpy-milter/dkimpy-milter.conf
$RPM_BUILD_ROOT/etc/dkimpy-milter/dkimpy-milter.conf
+%{__mv} $RPM_BUILD_ROOT/usr/bin/dkimpy-milter
$RPM_BUILD_ROOT/usr/sbin/dkimpy-milter
%clean
rm -rf $RPM_BUILD_ROOT
@@ -126,10 +127,10 @@ fi
%if %{with python2}
%files
%defattr(644,root,root,755)
-%doc README.md
+%doc README.md CHANGES
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/dkimpy-milter/dkimpy-milter.conf
%attr(754,root,root) /etc/rc.d/init.d/dkimpy-milter
-%attr(755,root,root) %{_bindir}/dkimpy-milter
+%attr(755,root,root) %{_sbindir}/dkimpy-milter
%{_mandir}/man5/dkimpy-milter.conf.5*
%{_mandir}/man8/dkimpy-milter.8*
%{py_sitescriptdir}/dkimpy_milter
@@ -139,10 +140,10 @@ fi
%if %{with python3}
%files -n python3-%{module}
%defattr(644,root,root,755)
-%doc README.md
+%doc README.md CHANGES
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/dkimpy-milter/dkimpy-milter.conf
%attr(754,root,root) /etc/rc.d/init.d/dkimpy-milter
-%attr(755,root,root) %{_bindir}/dkimpy-milter
+%attr(755,root,root) %{_sbindir}/dkimpy-milter
%{_mandir}/man5/dkimpy-milter.conf.5*
%{_mandir}/man8/dkimpy-milter.8*
%{py3_sitescriptdir}/dkimpy_milter
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/24e59a7bb573631229eba4aef5fa3793fa931006
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - prefer inet socket by default
commit c300b88712639cda2d28aded67d75e6651173065 Author: Marcin Krol Date: Sun May 29 16:13:34 2022 +0200 - prefer inet socket by default paths.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/paths.patch b/paths.patch index 1e49a51..e965d53 100644 --- a/paths.patch +++ b/paths.patch @@ -52,10 +52,10 @@ diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf dkimpy-milter-1.2.2/etc # ## local:/path/to/socket to listen on a UNIX domain socket # -#Socket local:/run/dkimpy-milter/dkimpy-milter.sock -+#Socket local:/var/spool/postfix/dkimpy-milter/dkimpy-milter.sock ++#Socket local:/var/spool/postfix/dkimpy/dkimpy-milter.sock # #Socket inet:8892@localhost -+Socket local:/var/spool/postfix/dkimpy-milter/dkimpy-milter.sock ++Socket inet:8892@localhost ## PidFile filename -### default /run/dkimpy-milter/dkimpy-milter.pid gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/24e59a7bb573631229eba4aef5fa3793fa931006 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - dkimpy dir under postfix spool
commit 4a6053927e579b2397b70046de10d25448794ebd
Author: Marcin Krol
Date: Sun May 29 16:11:31 2022 +0200
- dkimpy dir under postfix spool
paths.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/paths.patch b/paths.patch
index 80fece5..1e49a51 100644
--- a/paths.patch
+++ b/paths.patch
@@ -27,7 +27,7 @@ diff -ur dkimpy-milter-1.2.2.orig/dkimpy_milter/__init__.py
dkimpy-milter-1.2.2/
socketname = 'fd:3'
if socketname is None:
-socketname = 'local:/var/run/dkimpy-milter/dkimpy-milter.sock'
-+socketname =
'local:/var/spool/postfix/dkimpy-milter/dkimpy-milter.sock'
++socketname = 'local:/var/spool/postfix/dkimpy/dkimpy-milter.sock'
sys.stdout.flush()
if milterconfig.get('Syslog'):
syslog.syslog('dkimpy-milter starting:{0} user:{1}'
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/24e59a7bb573631229eba4aef5fa3793fa931006
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - package config file, still NFY
commit 454bbbd995da483c199761c9b8169ad2a3b70fc9
Author: Marcin Krol
Date: Sun May 29 14:41:48 2022 +0200
- package config file, still NFY
python-dkimpy-milter.spec | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/python-dkimpy-milter.spec b/python-dkimpy-milter.spec
index 394f21d..90566c6 100644
--- a/python-dkimpy-milter.spec
+++ b/python-dkimpy-milter.spec
@@ -16,7 +16,7 @@
Summary: DKIM signing and verification milter
Name: python-%{module}
Version: 1.2.2
-Release: 0.2
+Release: 0.3
License: BSD-like
Group: Libraries/Python
Source0:
https://files.pythonhosted.org/packages/source/d/dkimpy-milter/%{module}-%{version}.tar.gz
@@ -98,6 +98,8 @@ install %{SOURCE1}
$RPM_BUILD_ROOT/etc/rc.d/init.d/dkimpy-milter
%py3_install
%endif
+%{__mv} $RPM_BUILD_ROOT/usr/etc/dkimpy-milter/dkimpy-milter.conf
$RPM_BUILD_ROOT/etc/dkimpy-milter/dkimpy-milter.conf
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -125,6 +127,7 @@ fi
%files
%defattr(644,root,root,755)
%doc README.md
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/dkimpy-milter/dkimpy-milter.conf
%attr(754,root,root) /etc/rc.d/init.d/dkimpy-milter
%attr(755,root,root) %{_bindir}/dkimpy-milter
%{_mandir}/man5/dkimpy-milter.conf.5*
@@ -137,6 +140,7 @@ fi
%files -n python3-%{module}
%defattr(644,root,root,755)
%doc README.md
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/dkimpy-milter/dkimpy-milter.conf
%attr(754,root,root) /etc/rc.d/init.d/dkimpy-milter
%attr(755,root,root) %{_bindir}/dkimpy-milter
%{_mandir}/man5/dkimpy-milter.conf.5*
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/454bbbd995da483c199761c9b8169ad2a3b70fc9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-dkimpy-milter] - run as nobody by default
commit 3e710358c653704073f8fa14bbf16b5deb3c3a64
Author: Marcin Krol
Date: Sun May 29 14:36:07 2022 +0200
- run as nobody by default
paths.patch | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/paths.patch b/paths.patch
index a2fa0d4..80fece5 100644
--- a/paths.patch
+++ b/paths.patch
@@ -1,3 +1,15 @@
+diff -ur dkimpy-milter-1.2.2.orig/dkimpy_milter/config.py
dkimpy-milter-1.2.2/dkimpy_milter/config.py
+--- dkimpy-milter-1.2.2.orig/dkimpy_milter/config.py 2020-04-09
04:49:44.0 +0200
dkimpy-milter-1.2.2/dkimpy_milter/config.py2022-05-29
14:34:43.873562747 +0200
+@@ -42,7 +42,7 @@
+ 'MinimumKeyBits': 1024,
+ 'Socket': None,
+ 'PidFile': None,
+-'UserID': 'dkimpy-milter',
++'UserID': 'nobody',
+ 'Canonicalization': 'relaxed/simple',
+ 'InternalHosts': '127.0.0.1',
+ 'IntHosts': False,
diff -ur dkimpy-milter-1.2.2.orig/dkimpy_milter/__init__.py
dkimpy-milter-1.2.2/dkimpy_milter/__init__.py
--- dkimpy-milter-1.2.2.orig/dkimpy_milter/__init__.py 2020-08-09
20:15:48.0 +0200
+++ dkimpy-milter-1.2.2/dkimpy_milter/__init__.py 2022-05-29
13:50:24.310772566 +0200
@@ -21,7 +33,7 @@ diff -ur dkimpy-milter-1.2.2.orig/dkimpy_milter/__init__.py
dkimpy-milter-1.2.2/
syslog.syslog('dkimpy-milter starting:{0} user:{1}'
diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf
dkimpy-milter-1.2.2/etc/dkimpy-milter.conf
--- dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf2020-04-09
04:49:44.0 +0200
-+++ dkimpy-milter-1.2.2/etc/dkimpy-milter.conf 2022-05-29 13:51:41.948946914
+0200
dkimpy-milter-1.2.2/etc/dkimpy-milter.conf 2022-05-29 14:35:27.503655350
+0200
@@ -8,10 +8,10 @@
# privileged user (e.g. Postfix)
UMask 007
@@ -62,7 +74,7 @@ diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf
dkimpy-milter-1.2.2/etc
### a group ID as well, separated from the userid by a colon.
#
-UserIDdkimpy-milter
-+UserIDroot:postfix
++UserIDnobody:postfix
diff -ur dkimpy-milter-1.2.2.orig/setup.py dkimpy-milter-1.2.2/setup.py
--- dkimpy-milter-1.2.2.orig/setup.py 2020-08-09 20:16:23.0 +0200
+++ dkimpy-milter-1.2.2/setup.py 2022-05-29 13:28:25.815906789 +0200
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dkimpy-milter.git/commitdiff/454bbbd995da483c199761c9b8169ad2a3b70fc9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
