from:"hawk"

[packages/xorg-xserver-server] - allow building without systemd

2022-04-05 Thread hawk

commit aea03d5b2ba9b20cb0ace1f92fa67d0118fa8d38
Author: Marcin Krol 
Date:   Tue Apr 5 20:18:25 2022 +

- allow building without systemd

 xorg-xserver-server.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 3606b47..ca297a4 100644
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -18,6 +18,7 @@
 %bcond_without glamor  # glamor dix module
 %bcond_without systemtap   # systemtap/dtrace probes
 %bcond_without libunwind   # use libunwind for backtracing
+%bcond_without systemd # systemd
 #
 # ABI versions, see hw/xfree86/common/xf86Module.h
 %definexorg_xserver_server_ansic_abi   0.4
@@ -82,7 +83,7 @@ BuildRequires:pixman-devel >= %{pixman_ver}
 BuildRequires: pkgconfig >= 1:0.19
 BuildRequires: pkgconfig(gl) >= 1.2
 %{?with_systemtap:BuildRequires:   systemtap-sdt-devel}
-BuildRequires: systemd-devel >= 1:209
+%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel >= 1:143
 BuildRequires: xcb-util-devel
@@ -484,7 +485,7 @@ fi
%{!?with_xvfb:--disable-xvfb} \
%{!?with_systemtap:--without-dtrace} \
--without-fop \
-   --with-systemd-daemon
+   %{__with_without systemd systemd-daemon}
 
 %{__make}
 


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-xserver-server.git/commitdiff/aea03d5b2ba9b20cb0ace1f92fa67d0118fa8d38

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/cracklib] - fix R in python3 package

2022-04-05 Thread hawk

commit 1d583a2ae8f70bd0ed5242a65dc4416fcc5f93f8
Author: Marcin Krol 
Date:   Tue Apr 5 18:17:49 2022 +

- fix R in python3 package

 cracklib.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/cracklib.spec b/cracklib.spec
index 0c815f1..985ef77 100644
--- a/cracklib.spec
+++ b/cracklib.spec
@@ -15,7 +15,7 @@ Summary(tr.UTF-8):Parola denetim kitaplığı
 Summary(uk.UTF-8): Бібліотека перевірки паролів
 Name:  cracklib
 Version:   2.9.7
-Release:   4
+Release:   5
 License:   LGPL v2.1+
 Group: Libraries
 #Source0Download: https://github.com/cracklib/cracklib/releases
@@ -173,7 +173,7 @@ Summary:Python binding for cracklib
 Summary(pl.UTF-8): Wiązanie Pythona do crackliba
 Group: Libraries/Python
 Requires:  %{name} = %{version}-%{release}
-%pyrequires_eq python-libs
+%pyrequires_eq python3-libs
 
 %description -n python3-cracklib
 Python binding for cracklib.


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cracklib.git/commitdiff/1d583a2ae8f70bd0ed5242a65dc4416fcc5f93f8

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/pango] - builds fine w/o python-modules

2022-04-05 Thread hawk

commit 701bf45c2c16f37f09c6cef78a247012560903fb
Author: Marcin Krol 
Date:   Tue Apr 5 17:28:49 2022 +

- builds fine w/o python-modules

 pango.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/pango.spec b/pango.spec
index f7915e7..d4e9c77 100644
--- a/pango.spec
+++ b/pango.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):  System renderowania międzynarodowego 
tekstu
 Summary(pt_BR.UTF-8):  Sistema para layout e renderização de texto 
internacionalizado
 Name:  pango
 Version:   1.50.6
-Release:   1
+Release:   2
 Epoch: 1
 License:   LGPL v2+
 Group: X11/Libraries
@@ -37,7 +37,6 @@ BuildRequires:meson >= 0.55.3
 BuildRequires: ninja >= 1.5
 BuildRequires: perl-base
 BuildRequires: pkgconfig
-BuildRequires: python-modules
 BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
 %{?with_sysprof:BuildRequires: sysprof-devel >= 3.38}


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pango.git/commitdiff/701bf45c2c16f37f09c6cef78a247012560903fb

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/cairo] - rediffed

2022-04-05 Thread hawk

commit f2a9b2c406d574399ed0437524b0177d49775523
Author: Marcin Krol 
Date:   Tue Apr 5 17:27:15 2022 +

- rediffed

 cairo-link.patch | 9 +
 cairo.spec   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/cairo.spec b/cairo.spec
index 45f7009..ea6a9ce 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -29,7 +29,7 @@ Summary:  Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8): Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:  cairo
 Version:   1.16.0
-Release:   4
+Release:   5
 License:   LGPL v2.1 or MPL v1.1
 Group: Libraries
 Source0:   https://www.cairographics.org/releases/%{name}-%{version}.tar.xz
diff --git a/cairo-link.patch b/cairo-link.patch
index 8bce68a..2356428 100644
--- a/cairo-link.patch
+++ b/cairo-link.patch
@@ -1,6 +1,7 @@
 cairo-1.12.4/configure.ac~ 2012-09-13 13:38:21.0 +0200
-+++ cairo-1.12.4/configure.ac  2012-10-07 07:13:25.814449494 +0200
-@@ -71,7 +71,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib,
+diff -urNp -x '*.orig' cairo-1.16.0.org/configure.ac cairo-1.16.0/configure.ac
+--- cairo-1.16.0.org/configure.ac  2018-10-18 00:21:03.0 +
 cairo-1.16.0/configure.ac  2022-04-05 11:08:14.785626121 +
+@@ -89,7 +89,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib,
 if test "x$no_x" = xyes; then
   use_xlib="no (requires X development libraries)"
 else
@@ -8,4 +9,4 @@
 + xlib_NONPKGCONFIG_LIBS="$X_LIBS -lX11 -lXext 
$X_EXTRA_LIBS"
   xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS
 fi])
- ])
+ 


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cairo.git/commitdiff/f2a9b2c406d574399ed0437524b0177d49775523

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/xcb-proto] - adjust for automake 1.16.4 changes https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_re

2022-04-05 Thread hawk

commit 7e890e5fea799181d9a26c92bd2efd28422b5e3f
Author: Marcin Krol 
Date:   Tue Apr 5 16:01:12 2022 +

- adjust for automake 1.16.4 changes
  https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests/25

 xcb-proto-automake.patch | 14 ++
 xcb-proto.spec   |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/xcb-proto.spec b/xcb-proto.spec
index 8b4c7c4..a9feccc 100644
--- a/xcb-proto.spec
+++ b/xcb-proto.spec
@@ -9,12 +9,13 @@ Summary:  XML-XCB protocol description files
 Summary(pl.UTF-8): Pliki opisu protokołu XML-XCB
 Name:  xcb-proto
 Version:   1.14.1
-Release:   4
+Release:   5
 License:   MIT
 Group: Development/Libraries
 #Source0:  https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
 Source0:   
https://xorg.freedesktop.org/releases/individual/proto/%{name}-%{version}.tar.xz
 # Source0-md5: ecd6955dab1a7b9ba9756a11b8bdb48f
+Patch0:%{name}-automake.patch
 URL:   https://xcb.freedesktop.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1:1.12.6
@@ -76,6 +77,7 @@ Moduł xcbgen dla Pythona 3.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # rebuild ac/am to use python3 sitescriptdir (apply 
automake/revert-debian-python-hacks.patch)
diff --git a/xcb-proto-automake.patch b/xcb-proto-automake.patch
new file mode 100644
index 000..a6cceac
--- /dev/null
+++ b/xcb-proto-automake.patch
@@ -0,0 +1,14 @@
+Common subdirectories: xcb-proto-1.14.1.orig/doc and xcb-proto-1.14.1/doc
+Common subdirectories: xcb-proto-1.14.1.orig/src and xcb-proto-1.14.1/src
+diff -u xcb-proto-1.14.1.orig/xcb-proto.pc.in xcb-proto-1.14.1/xcb-proto.pc.in
+--- xcb-proto-1.14.1.orig/xcb-proto.pc.in  2020-10-08 22:31:54.0 
+
 xcb-proto-1.14.1/xcb-proto.pc.in   2022-04-05 15:59:21.958915952 +
+@@ -4,6 +4,7 @@
+ datadir=@datadir@
+ libdir=@libdir@
+ xcbincludedir=${pc_sysrootdir}@xcbincludedir@
++PYTHON_PREFIX=@PYTHON_PREFIX@
+ pythondir=${pc_sysrootdir}@pythondir@
+ 
+ Name: XCB Proto
+Common subdirectories: xcb-proto-1.14.1.orig/xcbgen and xcb-proto-1.14.1/xcbgen


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xcb-proto.git/commitdiff/7e890e5fea799181d9a26c92bd2efd28422b5e3f

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/swig] - allow building with python 2.x, 3.x, both or none

2022-04-05 Thread hawk

commit 1fddf32ae5312bbc34f8af1fdda6fe482bcac89a
Author: Marcin Krol 
Date:   Tue Apr 5 15:35:00 2022 +

- allow building with python 2.x, 3.x, both or none

 swig.spec | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/swig.spec b/swig.spec
index 334e93a..37e351e 100644
--- a/swig.spec
+++ b/swig.spec
@@ -3,6 +3,8 @@
 %bcond_without guile   # disable guile support
 %bcond_without perl# disable perl support
 %bcond_without php # disable php support
+%bcond_without python2 # disable python 2.x support
+%bcond_without python3 # disable python 3.x support
 %bcond_without ruby# disable ruby support
 %bcond_without tcl # disable tcl support
 #
@@ -15,7 +17,7 @@ Summary(pl.UTF-8):Generator interfejsów do Perla, Tcl-a, 
Guile'a i Pythona
 Summary(pt_BR.UTF-8):  Gerador de Interfaces e "Wrappers" Simplificado (SWIG)
 Name:  swig
 Version:   4.0.2
-Release:   1
+Release:   2
 License:   GPL v3+ (utility), free (library)
 Group: Development/Languages
 Source0:   https://downloads.sourceforge.net/swig/%{name}-%{version}.tar.gz
@@ -34,10 +36,14 @@ BuildRequires:  pcre-devel
 %{?with_perl:BuildRequires:perl-devel >= 1:5.6.1}
 %{?with_php:BuildRequires: %{php_name}-cli}
 %{?with_php:BuildRequires: %{php_name}-devel >= 4.1.0}
+%if %{with python2}
 BuildRequires: python-devel >= 1:2.3.2
 BuildRequires: python-modules
+%endif
+%if %{with python2}
 BuildRequires: python3-devel
 BuildRequires: python3-modules
+%endif
 BuildRequires: rpm-pythonprov
 %if %{with ruby}
 BuildRequires: rpmbuild(macros) >= 1.277
@@ -172,7 +178,9 @@ Moduł SWIG do generowania wiązań języka Tcl.
 %{__aclocal} -I Tools/config
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+   %{!?with_python2:--without-python} \
+   %{!?with_python3:--without-python3}
 
 %{__make} \
OPT="%{rpmcflags}"
@@ -238,9 +246,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/%{version}/php
 %endif
 
+%if %{with python2} || %{with python3}
 %files python
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/%{version}/python
+%endif
 
 %if %{with ruby}
 %files ruby


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/swig.git/commitdiff/1fddf32ae5312bbc34f8af1fdda6fe482bcac89a

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/libxcb] - force python 3.x

2022-04-05 Thread hawk

commit 1b00c2ae3d03d8e6a4300f61e6b0c89c92d195c9
Author: Marcin Krol 
Date:   Tue Apr 5 15:34:12 2022 +

- force python 3.x

 libxcb-python3.patch | 12 
 libxcb.spec  |  8 +---
 2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/libxcb.spec b/libxcb.spec
index bb78dc8..51ffac6 100644
--- a/libxcb.spec
+++ b/libxcb.spec
@@ -7,12 +7,13 @@ Summary:  X protocol C-language Binding library
 Summary(pl.UTF-8): XCB - biblioteka dowiązań języka C do protokołu X
 Name:  libxcb
 Version:   1.14
-Release:   1
+Release:   2
 License:   MIT
 Group: Libraries
 #Source0:  https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
 Source0:   
https://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.xz
 # Source0-md5: f90b6e4541e9518b4c373b734f475ae7
+Patch0:%{name}-python3.patch
 URL:   https://xcb.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -22,8 +23,8 @@ BuildRequires:doxygen
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libxslt-progs
 BuildRequires: pkgconfig
-BuildRequires: python >= 1:2.6
-BuildRequires: python-modules >= 1:2.6
+BuildRequires: python3
+BuildRequires: python3-modules
 BuildRequires: tar >= 1:1.22
 BuildRequires: xcb-proto >= 1.14
 BuildRequires: xorg-lib-libXau-devel >= 0.99.2
@@ -117,6 +118,7 @@ Dokumentacja API biblioteki XCB.
 
 %prep
 %setup -q
+%patch0 -p1
 %if %{without graphviz}
 %{__sed} -i -e 's/HAVE_DOT   = YES/HAVE_DOT   = NO/g' 
doc/xcb.doxygen.in
 %endif
diff --git a/libxcb-python3.patch b/libxcb-python3.patch
new file mode 100644
index 000..ddf4c04
--- /dev/null
+++ b/libxcb-python3.patch
@@ -0,0 +1,12 @@
+diff -ur libxcb-1.14.orig/configure.ac libxcb-1.14/configure.ac
+--- libxcb-1.14.orig/configure.ac  2020-02-22 20:50:14.0 +
 libxcb-1.14/configure.ac   2022-04-05 12:56:51.059604090 +
+@@ -12,7 +12,7 @@
+ 
+ # Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-xz])
+-AM_PATH_PYTHON([2.6])
++AM_PATH_PYTHON([3])
+ 
+ # Set common system defines for POSIX extensions, such as _GNU_SOURCE
+ # Must be called before any macros that run the compiler (like 
AC_PROG_LIBTOOL)


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libxcb.git/commitdiff/1b00c2ae3d03d8e6a4300f61e6b0c89c92d195c9

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/Firebird] - debugsource is empty, disable it

2022-04-04 Thread hawk

commit b2f1d5350994eb649c8e12e45f7df39d010731a9
Author: Marcin Krol 
Date:   Mon Apr 4 22:55:41 2022 +0200

- debugsource is empty, disable it

 Firebird.spec | 1 +
 1 file changed, 1 insertion(+)
---
diff --git a/Firebird.spec b/Firebird.spec
index 1d484bc..f90dcde 100644
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -87,6 +87,7 @@ Requires: %{name}-lib = %{version}-%{release}
 ExclusiveArch: %{ix86} %{x8664} x32 arm ia64 mips mipsel ppc sparc sparcv9 
alpha
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define_debugsource_packages   0
 %defineibdir   %{_libdir}/interbase
 %definespecflags   -fno-strict-aliasing
 %definedebugcflags -O1 -g -Wall -fno-strict-aliasing


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Firebird.git/commitdiff/b2f1d5350994eb649c8e12e45f7df39d010731a9

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/amavisd-new] - cosmetics

2022-04-04 Thread hawk

commit bead7e813b93ea2d03103dc67a10a2aac2c7e313
Author: Marcin Krol 
Date:   Mon Apr 4 19:53:43 2022 +

- cosmetics

 amavisd-new.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 35b324e..0e5d77c 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,6 @@
 # - Add polish info mail templates
 # - move amavis part of tmpwatch configuration from tmpwatch.spec
 #
-%define_debugsource_packages   0
 Summary:   A Mail Virus Scanner with SpamAssassin support - daemon
 Summary(pl.UTF-8): Antywirusowy skaner poczty elektronicznej z obsługą 
SpamAssasina - demon
 Name:  amavisd-new
@@ -105,6 +104,7 @@ Conflicts:  amavis-stats <= 0.1.12
 Conflicts: postfix < 2.7.0
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define_debugsource_packages   0
 %define_tmpwatchdir/etc/tmpwatch
 %defineschemadir   /usr/share/openldap/schema
 


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/amavisd-new.git/commitdiff/bead7e813b93ea2d03103dc67a10a2aac2c7e313

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/procmail] - debugsource is empty, disable it

2022-04-04 Thread hawk

commit e8978d11c6ea3da2e2b7c17c7a927c81da1ac08d
Author: Marcin Krol 
Date:   Mon Apr 4 19:52:52 2022 +

- debugsource is empty, disable it

 procmail.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/procmail.spec b/procmail.spec
index 8e91595..8fc7b1c 100644
--- a/procmail.spec
+++ b/procmail.spec
@@ -11,7 +11,7 @@ Summary(zh_CN.UTF-8): [服务器]分发mail到用户的守护进程
 Summary(zh_TW.UTF-8):  [祀務器]分蛛mail到用戶的佐鰾園評
 Name:  procmail
 Version:   3.22
-Release:   21
+Release:   22
 License:   GPL v2+ or Artistic
 Group: Applications/Mail
 Source0:   http://www.procmail.org/%{name}-%{version}.tar.gz
@@ -34,6 +34,8 @@ Patch10:  procmail-3.22-crash-fix.patch
 URL:   http://www.procmail.org/
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define_debugsource_packages   0
+
 %description
 Red Hat Linux uses procmail for all local mail delivery. In addition
 to regluar mail delivery duties, procmail can be used to do many


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/procmail.git/commitdiff/e8978d11c6ea3da2e2b7c17c7a927c81da1ac08d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/procmail] - rediffed

2022-04-04 Thread hawk

commit de3d81a22d8b1db9980ef3808927015f0a6f4f1f
Author: Marcin Krol 
Date:   Mon Apr 4 18:04:02 2022 +

- rediffed

 procmail-lockf.patch | 12 ++--
 procmail.spec|  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/procmail.spec b/procmail.spec
index 9819ffd..8e91595 100644
--- a/procmail.spec
+++ b/procmail.spec
@@ -11,7 +11,7 @@ Summary(zh_CN.UTF-8): [服务器]分发mail到用户的守护进程
 Summary(zh_TW.UTF-8):  [祀務器]分蛛mail到用戶的佐鰾園評
 Name:  procmail
 Version:   3.22
-Release:   20
+Release:   21
 License:   GPL v2+ or Artistic
 Group: Applications/Mail
 Source0:   http://www.procmail.org/%{name}-%{version}.tar.gz
diff --git a/procmail-lockf.patch b/procmail-lockf.patch
index 8e93abb..d02e48b 100644
--- a/procmail-lockf.patch
+++ b/procmail-lockf.patch
@@ -1,7 +1,7 @@
-diff -urN procmail-3.14.org/config.h procmail-3.14/config.h
 procmail-3.14.org/config.h Thu Mar  9 11:54:32 2000
-+++ procmail-3.14/config.h Thu Mar  9 11:57:51 2000
-@@ -51,8 +51,8 @@
+diff -urNp -x '*.orig' procmail-3.22.org/config.h procmail-3.22/config.h
+--- procmail-3.22.org/config.h 2001-09-11 04:53:50.0 +
 procmail-3.22/config.h 2022-04-04 18:03:38.380223294 +
+@@ -77,8 +77,8 @@
  #define TRUSTED_IDS   {"root","daemon","uucp","mail","x400","network",\
 "list","slist","lists","news",0}
  
@@ -10,5 +10,5 @@ diff -urN procmail-3.14.org/config.h procmail-3.14/config.h
 +#define NO_fcntl_LOCK /* uncomment any of these three if you   */
 +#define NO_lockf_LOCK /* definitely do not want procmail to make   */
  /*#define NO_flock_LOCK   /* use of those kernel-locking methods  
 */
- 
- /*#define RESTRICT_EXEC 100   /* uncomment to prevent users with uids equal
+   /* If you set LOCKINGTEST to a binary number
+   than there's no need to set these.  These #defines are only useful


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/procmail.git/commitdiff/de3d81a22d8b1db9980ef3808927015f0a6f4f1f

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/libtommath] - rediffed

2022-04-04 Thread hawk

commit 633b0a19624c60913ea27a98c16e803c51eb2227
Author: Marcin Krol 
Date:   Mon Apr 4 17:55:17 2022 +

- rediffed

 libtommath-pc.patch | 9 +
 libtommath.spec | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/libtommath.spec b/libtommath.spec
index b5caf48..f2453ea 100644
--- a/libtommath.spec
+++ b/libtommath.spec
@@ -2,7 +2,7 @@ Summary:LibTomMath - routines for integer based number 
theoretic applications
 Summary(pl.UTF-8): LibTomMath - procedury do zastosowań teorii liczb z 
zakresu liczb całkowitych
 Name:  libtommath
 Version:   1.2.0
-Release:   1
+Release:   2
 License:   Public Domain or WTFPL v2
 Group: Libraries
 #Source0Download: https://github.com/libtom/libtommath/releases
diff --git a/libtommath-pc.patch b/libtommath-pc.patch
index daf49b0..f849d47 100644
--- a/libtommath-pc.patch
+++ b/libtommath-pc.patch
@@ -1,8 +1,9 @@
 libtommath-1.0.1/makefile.shared.orig  2017-08-29 22:27:36.0 
+0200
-+++ libtommath-1.0.1/makefile.shared   2018-04-13 18:32:50.038012830 +0200
-@@ -64,7 +64,7 @@
+diff -urNp -x '*.orig' libtommath-1.2.0.org/makefile.shared 
libtommath-1.2.0/makefile.shared
+--- libtommath-1.2.0.org/makefile.shared   2019-10-22 09:44:44.0 
+
 libtommath-1.2.0/makefile.shared   2022-04-04 17:54:55.505014848 +
+@@ -70,7 +70,7 @@ install: $(LIBNAME)
install -d $(DESTDIR)$(INCPATH)
-   $(LT) --mode=install install -m 644 $(LIBNAME) 
$(DESTDIR)$(LIBPATH)/$(LIBNAME)
+   $(LIBTOOL) --mode=install install -m 644 $(LIBNAME) 
$(DESTDIR)$(LIBPATH)/$(LIBNAME)
install -m 644 $(HEADERS_PUB) $(DESTDIR)$(INCPATH)
 -  sed -e 's,^prefix=.*,prefix=$(PREFIX),' -e 's,^Version:.*,Version: 
$(VERSION_PC),' libtommath.pc.in > libtommath.pc
 +  sed -e 's,^prefix=.*,prefix=$(PREFIX),' -e 
's,^libdir=.*,libdir=$(LIBPATH),' -e 's,^Version:.*,Version: $(VERSION_PC),' 
libtommath.pc.in > libtommath.pc


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libtommath.git/commitdiff/633b0a19624c60913ea27a98c16e803c51eb2227

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/Firebird] - rediffed patches

2022-04-04 Thread hawk

commit 7130cd5053542e28197ce1a346347121595e4b79
Author: Marcin Krol 
Date:   Mon Apr 4 17:53:58 2022 +

- rediffed patches

 Firebird-chmod.patch   |   9 ++--
 Firebird-gcc-icu.patch |  21 -
 Firebird.spec  |   4 +-
 parallel-build.patch   | 117 ++---
 4 files changed, 76 insertions(+), 75 deletions(-)
---
diff --git a/Firebird.spec b/Firebird.spec
index 1717360..1d484bc 100644
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -16,7 +16,7 @@ Summary(de.UTF-8):Firebird - relationalen Open-Source- 
Datenbankmanagementsyste
 Summary(pl.UTF-8): Firebird - serwer baz danych SQL oraz narzędzia 
klienckie
 Name:  Firebird
 Version:   3.0.7.33374
-Release:   1
+Release:   2
 License:   Interbase Public License 1.0, Initial Developer's Public 
License 1.0
 Group: Applications/Databases
 Source0:   
https://github.com/FirebirdSQL/firebird/releases/download/R3_0_7/%{name}-%{version}-0.tar.bz2
@@ -195,7 +195,7 @@ Skrypty startowe Firebirda w wersji Classic (inetd).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p0
+%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
diff --git a/Firebird-chmod.patch b/Firebird-chmod.patch
index 5b6fb83..7a239e0 100644
--- a/Firebird-chmod.patch
+++ b/Firebird-chmod.patch
@@ -1,8 +1,9 @@
 firebird-1.5.0.4290/builds/posix/make.defaults.orig2003-11-11 
02:01:51.0 +0100
-+++ firebird-1.5.0.4290/builds/posix/make.defaults 2004-05-24 
23:47:17.602325704 +0200
-@@ -92,9 +92,9 @@
- SH=   sh -c
+diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/make.defaults 
Firebird-3.0.7.33374-0/builds/posix/make.defaults
+--- Firebird-3.0.7.33374-0.org/builds/posix/make.defaults  2020-10-20 
08:40:05.0 +
 Firebird-3.0.7.33374-0/builds/posix/make.defaults  2022-04-04 
17:50:57.999465936 +
+@@ -142,9 +142,9 @@ SH=sh -c
  RM=   rm -f
+ RM_R= rm -rf
  CHMOD=chmod
 -CHMOD_6=  chmod 666
 -CHMOD_7=  chmod 777
diff --git a/Firebird-gcc-icu.patch b/Firebird-gcc-icu.patch
index 808a51c..c5c0814 100644
--- a/Firebird-gcc-icu.patch
+++ b/Firebird-gcc-icu.patch
@@ -1,16 +1,11 @@
-# Author: Adriano dos Santos Fernandes
-#Index: src/common/classes/alloc.h
-#===
-#RCS file: /cvsroot/firebird/firebird2/src/common/classes/alloc.h,v
-#retrieving revision 1.71
-diff -u -p -r1.71 alloc.h
 src/common/classes/alloc.h 26 Sep 2007 17:48:20 -  1.71
-+++ src/common/classes/alloc.h 20 May 2009 02:20:08 -
-@@ -47,6 +47,7 @@
- #include  /* XPG: prototypes for malloc/free have to be in
-  stdlib.h (EKU) */
+diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/src/common/classes/alloc.h 
Firebird-3.0.7.33374-0/src/common/classes/alloc.h
+--- Firebird-3.0.7.33374-0.org/src/common/classes/alloc.h  2020-10-20 
08:40:05.0 +
 Firebird-3.0.7.33374-0/src/common/classes/alloc.h  2022-04-04 
17:51:33.923548962 +
+@@ -55,6 +55,7 @@
+ #else
+ #include 
  #endif
 +#include 
  
- #ifdef _MSC_VER
- #define THROW_BAD_ALLOC
+ #include 
+ 
diff --git a/parallel-build.patch b/parallel-build.patch
index dc43df9..30a393f 100644
--- a/parallel-build.patch
+++ b/parallel-build.patch
@@ -8,9 +8,10 @@ Description: allow building with make -jN
 Author: Damyan Ivanov 
 Forwarded: no
 
 a/builds/posix/Makefile.in
-+++ b/builds/posix/Makefile.in
-@@ -329,8 +329,8 @@ yachts.lnk:metadata.fdb
+diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in 
Firebird-3.0.7.33374-0/builds/posix/Makefile.in
+--- Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in2022-04-04 
17:53:31.957821756 +
 Firebird-3.0.7.33374-0/builds/posix/Makefile.in2022-04-04 
17:53:33.598825549 +
+@@ -359,8 +359,8 @@ yachts.lnk:metadata.fdb
  
  metadata.fdb: $(RUN_ISQL) $(SRC_ROOT)/dbs/metadata.sql
-$(RM) $@
@@ -21,7 +22,7 @@ Forwarded: no
$(CHMOD) 0444 $@
  
  $(HELP_FDB):  help.fdb
-@@ -339,7 +339,7 @@ $(HELP_FDB):   help.fdb
+@@ -369,7 +369,7 @@ $(HELP_FDB):   help.fdb
$(CHMOD) 0444 $@
  
  help.fdb: $(BLD_ROOT)/misc/help.gbak
@@ -30,7 +31,7 @@ Forwarded: no
$(CHMOD) 0444 $@
  
  $(SECURITY_FDB):  security.fdb
-@@ -349,18 +349,18 @@ $(SECURITY_FDB): security.fdb
+@@ -379,18 +379,18 @@ $(SECURITY_FDB): security.fdb
  security.fdb: $(SRC_ROOT)/dbs/security.sql
-$(RM) $@
-$(RM) $(SECURITY_TMP)
@@ -56,7 +57,7 @@ Forwarded: no
$(TOUCH) $@
  
  
-@@ -528,7 +528,7 @@ codes: gen_codes
+@@ -562,7 +562,7 @@ codes: gen_codes
  ids:  $(IDS)
  
  gen_codes:$(CODES) msg.timestamp
@@ -64,8 +65,8 @@ Forwarded: no
 +  $(call LOCK_RUN,$(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT))
  
  $(CODES): $(CODES_Objects) $(COMMON_LIB)
-

[packages/imap] - build just c-client library by default, note: this is >10 years old unmaintained software, perha

2022-04-04 Thread hawk

commit f55344c3a65d3a9f4b0d7774dca20bac9c50e1e0
Author: Marcin Krol 
Date:   Mon Apr 4 15:55:54 2022 +

- build just c-client library by default, note: this is >10 years old
  unmaintained software, perhaps we should drop it entirely?

 imap.spec | 64 ---
 1 file changed, 45 insertions(+), 19 deletions(-)
---
diff --git a/imap.spec b/imap.spec
index e5e2d51..c08cad0 100644
--- a/imap.spec
+++ b/imap.spec
@@ -1,3 +1,4 @@
+%bcond_withserver  # build IMAP/POP servers
 Summary:   Support for IMAP network mail protocol
 Summary(es.UTF-8): Provee soporte para los protocolos de mail IMAP y POP
 Summary(pl.UTF-8): Obsługa protokołu pocztowego IMAP
@@ -7,11 +8,13 @@ Summary(uk.UTF-8):Забезпечує підтримку мережевого
 Summary(zh_CN.UTF-8):  IMAP和POP服务器
 Name:  imap
 Version:   2007f
-Release:   8
+Release:   9
 Epoch: 1
 License:   Apache v2.0
 Group: Networking/Daemons
-Source0:   ftp://ftp.cac.washington.edu/mail/%{name}-%{version}.tar.gz
+# Remaining mirror at funet.fi
+# Note: there is also https://github.com/uw-imap/imap
+Source0:   
http://ftp.funet.fi/index/unix/mail/imap/ftp.cac.washington.edu/mail/%{name}-%{version}.tar.gz
 # Source0-md5: 2126fd125ea26b73b20f01fcd5940369
 Source1:   %{name}.pamd
 Source2:   %{name}-%{name}d.inetd
@@ -309,14 +312,11 @@ cd ../..
 rm -rf docs/{rfc,BUILD}
 
 %build
-# build with non-recommended SSLTYPE (unix) since unix.nopwd would remove
-# support for plain-text auth w/o SSL/TLS
-# (but it should be made some runtime option!
-echo 'y' | %{__make} lnp \
+%if %{with server}
+%{__make} lnp \
CC="%{__cc}" \
GCCOPTLEVEL="%{rpmcflags} -pipe -fPIC" \
LDOPT="%{rpmldflags}" \
-   SSLTYPE=unix \
 %if "%{pld_release}" != "th"
SSLCERTS=/var/lib/openssl/certs \
SSLKEYS=/var/lib/openssl/private \
@@ -326,13 +326,11 @@ echo 'y' | %{__make} lnp \
 %endif
VERSION="%{version}"
 mv -f c-client/c-client.a libc-client.a
-
 %{__make} clean
-echo 'y' | %{__make} lnps \
+%{__make} lnps \
CC="%{__cc}" \
GCCOPTLEVEL="%{rpmcflags} -pipe -fPIC" \
LDOPT="%{rpmldflags}" \
-   SSLTYPE=unix \
 %if "%{pld_release}" != "th"
SSLCERTS=/var/lib/openssl/certs \
SSLKEYS=/var/lib/openssl/private \
@@ -341,9 +339,29 @@ echo 'y' | %{__make} lnps \
SSLKEYS=/etc/openssl/private \
 %endif
VERSION="%{version}"
+%endif
+
+%if !%{with server}
+%{__make} an SSLTYPE=nopwd
+cd c-client
+%{__make} lnp \
+   CC="%{__cc}" \
+   GCCOPTLEVEL="%{rpmcflags} -pipe -fPIC" \
+   LDOPT="%{rpmldflags}" \
+   VERSION="%{version}"
+mv -f c-client.a ../libc-client.a
+%{__make} clean
+%{__make} lnps \
+   CC="%{__cc}" \
+   GCCOPTLEVEL="%{rpmcflags} -pipe -fPIC" \
+   LDOPT="%{rpmldflags}" \
+   VERSION="%{version}"
+cd ..
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%if %{with server}
 install -d $RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd} \
$RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_includedir},%{_libdir}} \
$RPM_BUILD_ROOT%{_mandir}/man{1,8} \
@@ -352,13 +370,9 @@ install -d 
$RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd} \
 %else
$RPM_BUILD_ROOT/etc/openssl/certs
 %endif
-
-install src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipop2d.8
-install src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipop3d.8
-install src/imapd/imapd.8 $RPM_BUILD_ROOT%{_mandir}/man8/imapd.8
-install src/dmail/dmail.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install src/mailutil/mailutil.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install src/tmail/tmail.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%else
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
+%endif
 
 install c-client/*.h $RPM_BUILD_ROOT%{_includedir}
 install c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}
@@ -369,6 +383,14 @@ ln -sf libc-client.so.%{version}.0 
$RPM_BUILD_ROOT%{_libdir}/libc-client.so
 rm -f  $RPM_BUILD_ROOT%{_includedir}/unix.h \
$RPM_BUILD_ROOT%{_includedir}/os_*
 
+%if %{with server}
+install src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipop2d.8
+install src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipop3d.8
+install src/imapd/imapd.8 $RPM_BUILD_ROOT%{_mandir}/man8/imapd.8
+install src/dmail/dmail.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install src/mailutil/mailutil.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install src/tmail/tmail.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
 install ipopd/{ipop2d,ipop3d} $RPM_BUILD_ROOT%{_sbindir}
 install imapd/imapd $RPM_BUILD_ROOT%{_sbindir}
 install dmail/dmail $RPM_BUILD_ROOT%{_bindir}
@@ -390,11 +412,11 @@ install %{SOURCE8} 
$RPM_BUILD_ROOT%{_var}/lib/openssl/certs/ipop3d.pem
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/openssl/certs/imapd.pem
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/openssl/certs/ipop3d.pem
 %endif
+touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
+%endif
 
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
 
-touch

DISTFILES: busybox: busybox-1.35.0.tar.bz2

2022-04-03 Thread hawk

Request by: hawk


Files fetched: 1

STORED: http://www.busybox.net/downloads/busybox-1.35.0.tar.bz2
585949b1dd4292b604b7d199866e9913  busybox-1.35.0.tar.bz2
Size: 2480624 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/busybox] - updated to 1.35.0, still fails to link

2022-04-03 Thread hawk

commit 36e1d67ece0ca35cc00c0f333ed28d7a37632e38
Author: Marcin Krol 
Date:   Sun Apr 3 22:04:28 2022 +

- updated to 1.35.0, still fails to link

 busybox-initrd.config |  1 +
 busybox.config| 11 +++
 busybox.spec  |  4 ++--
 x32.patch | 21 ++---
 4 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/busybox.spec b/busybox.spec
index d114b83..4076bdb 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -41,12 +41,12 @@ Summary(pl.UTF-8):  Zestaw narzędzi uniksowych dla systemów 
wbudowanych
 Summary(pt_BR.UTF-8):  BusyBox é um conjunto de utilitários UNIX em um único 
binário
 Name:  busybox
 # stable line only
-Version:   1.34.1
+Version:   1.35.0
 Release:   0.1
 License:   GPL v2
 Group: Applications
 Source0:   http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 5ad7368a73d12b8c4f8881bf7afb3d82
+# Source0-md5: 585949b1dd4292b604b7d199866e9913
 Source1:   %{name}.config
 Source2:   %{name}-initrd.config
 %{?with_altconfig:Source3: %{cfgfile}}
diff --git a/busybox-initrd.config b/busybox-initrd.config
index 05e391a..3c38923 100644
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -61,6 +61,7 @@ CONFIG_CROSS_COMPILER_PREFIX=""
 CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
 CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
 
 #
 # Debugging Options
diff --git a/busybox.config b/busybox.config
index 290c057..61cf0d5 100644
--- a/busybox.config
+++ b/busybox.config
@@ -66,6 +66,7 @@ CONFIG_CROSS_COMPILER_PREFIX=""
 CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
 CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
 
 #
 # Debugging Options
@@ -153,6 +154,8 @@ CONFIG_BZIP2_SMALL=8
 CONFIG_CPIO=y
 CONFIG_FEATURE_CPIO_O=y
 CONFIG_FEATURE_CPIO_P=y
+CONFIG_FEATURE_CPIO_IGNORE_DEVNO=y
+CONFIG_FEATURE_CPIO_RENUMBER_INODES=y
 CONFIG_DPKG=y
 CONFIG_DPKG_DEB=y
 CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
@@ -193,6 +196,7 @@ CONFIG_FEATURE_UNZIP_CDF=y
 CONFIG_FEATURE_UNZIP_BZIP2=y
 CONFIG_FEATURE_UNZIP_LZMA=y
 CONFIG_FEATURE_UNZIP_XZ=y
+CONFIG_FEATURE_TIMEZONE=y
 
 #
 # Coreutils
@@ -462,7 +466,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y
 CONFIG_FIND=y
 CONFIG_FEATURE_FIND_PRINT0=y
 CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_ATIME=y
+CONFIG_FEATURE_FIND_CTIME=y
 CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_AMIN=y
+CONFIG_FEATURE_FIND_CMIN=y
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_EXECUTABLE=y
@@ -470,6 +478,7 @@ CONFIG_FEATURE_FIND_XDEV=y
 CONFIG_FEATURE_FIND_MAXDEPTH=y
 CONFIG_FEATURE_FIND_NEWER=y
 CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_SAMEFILE=y
 CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_FEATURE_FIND_EXEC_PLUS=y
 CONFIG_FEATURE_FIND_USER=y
@@ -892,6 +901,7 @@ CONFIG_FTPPUT=y
 CONFIG_HOSTNAME=y
 CONFIG_DNSDOMAINNAME=y
 CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=80
 CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -985,6 +995,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 CONFIG_FEATURE_TELNET_WIDTH=y
 CONFIG_TELNETD=y
 CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23
 CONFIG_FEATURE_TELNETD_INETD_WAIT=y
 CONFIG_TFTP=y
 CONFIG_TFTPD=y
diff --git a/x32.patch b/x32.patch
index 0be941e..2874cb0 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,20 +1,19 @@
 busybox-1.22.1/include/libbb.h.orig2015-01-26 19:38:58.762414035 
+
-+++ busybox-1.22.1/include/libbb.h 2015-01-26 19:39:20.749079926 +
-@@ -232,6 +232,13 @@
- #else
- /* CONFIG_LFS is off */
- # if UINT_MAX == 0x
+diff -ur busybox-1.35.0.orig/include/libbb.h busybox-1.35.0/include/libbb.h
+--- busybox-1.35.0.orig/include/libbb.h2021-12-26 16:53:26.0 
+
 busybox-1.35.0/include/libbb.h 2022-04-03 22:02:20.060835065 +
+@@ -312,11 +312,19 @@
+  * gcc will throw warnings on printf("%d", off_t)... Have to use %ld etc.
+  */
+ # if UINT_MAX == ULONG_MAX
 +#ifdef __ILP32__
 +typedef unsigned long long uoff_t;
-+#  define XATOOFF(a) xatoull_range((a), 0, LLONG_MAX)
-+#  define BB_STRTOOFF bb_strtoull
++#  define XATOOFF(a) xatoull_range((a), 0, LLONG_MA_STRTOOFF bb_strX)
++#  define BBtoull
 +#  define STRTOOFF strtoull
 +#  define OFF_FMT "ll"
 +#else
- /* While sizeof(off_t) == sizeof(int), off_t is typedef'ed to long anyway.
-  * gcc will throw warnings on printf("%d", off_t). Crap... */
  typedef unsigned long uoff_t;
-@@ -239,6 +246,7 @@
+ #  define XATOOFF(a) xatoi_positive(a)
  #  define BB_STRTOOFF bb_strtou
  #  define STRTOOFF strtol
  #  define OFF_FMT "l"


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/busybox.git/commitdiff/36e1d67ece0ca35cc00c0f333ed28d7a37632e38

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/smack] - allow building without systemd

2022-04-03 Thread hawk

commit 4b41ad3443f3202e020d2b42f59afb7e94ad7752
Author: Marcin Krol 
Date:   Sun Apr 3 22:07:07 2022 +0200

- allow building without systemd

 smack.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/smack.spec b/smack.spec
index 3225730..27d4166 100644
--- a/smack.spec
+++ b/smack.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without apidocs # do not build and package API docs
 %bcond_without static_libs # don't build static libraries
+%bcond_without systemd # build without systemd
 
 Summary:   SMACK userspace package
 Summary(pl.UTF-8): Pakiet SMACK dla przestrzeni użytkownika
@@ -19,7 +20,7 @@ BuildRequires:automake >= 1:1.11
 BuildRequires: doxygen
 BuildRequires: libtool >= 2:2.2
 BuildRequires: pkgconfig
-BuildRequires: systemd-devel >= 1:198
+%{?with_systemd:BuildRequires: systemd-devel >= 1:198}
 Requires:  %{name}-libs = %{version}-%{release}
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/smack.git/commitdiff/4b41ad3443f3202e020d2b42f59afb7e94ad7752

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/coreutils] - https://raw.githubusercontent.com/jarun/advcpmv/master/advcpmv-0.9-9.0.patch

2022-04-03 Thread hawk

commit b09470a35581bad1c7ae5a6f2cff09d5693660c8
Author: Marcin Krol 
Date:   Sun Apr 3 19:55:06 2022 +

- 
https://raw.githubusercontent.com/jarun/advcpmv/master/advcpmv-0.9-9.0.patch

 coreutils-advcopy.patch | 514 
 1 file changed, 346 insertions(+), 168 deletions(-)
---
diff --git a/coreutils-advcopy.patch b/coreutils-advcopy.patch
index 3b580e7..e466c9a 100644
--- a/coreutils-advcopy.patch
+++ b/coreutils-advcopy.patch
@@ -1,10 +1,11 @@
-diff -aur coreutils-8.32/src/copy.c coreutils-8.32-patched/src/copy.c
 coreutils-8.32/src/copy.c  2020-01-01 19:43:12.0 +0530
-+++ coreutils-8.32-patched/src/copy.c  2020-12-06 22:25:53.076852462 +0530
-@@ -129,6 +129,72 @@
+diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
+--- coreutils-9.0/src/copy.c   2021-09-24 17:01:05.0 +0530
 coreutils-9.0-patched/src/copy.c   2022-03-27 05:54:15.840209369 +0530
+@@ -129,6 +129,133 @@
dev_t dev;
  };
  
++/* BEGIN progress mod */
 +struct progress_status {
 +  int iCountDown;
 +  char ** cProgressField;
@@ -13,7 +14,69 @@ diff -aur coreutils-8.32/src/copy.c 
coreutils-8.32-patched/src/copy.c
 +  struct stat src_open_sb;
 +};
 +
-+/* Begin progress Mod*/
++FILE * spawn( const char *cmd, char *const argv[] )
++{
++FILE *ret = NULL;
++int pfd_read[2];
++pid_t pid;
++
++if (cmd == NULL || argv == NULL)
++return ret;
++
++if (pipe(pfd_read) < 0) {
++error(0, errno, "pipe: %s", cmd);
++return ret;
++}
++
++if ((pid = fork()) == 0) {
++int err = dup2(pfd_read[1], 1) < 0;
++close(pfd_read[0]);
++close(pfd_read[1]);
++
++if (err)
++error(EXIT_FAILURE, errno, "dup2: %s", cmd);
++execvp(cmd, argv);
++error(EXIT_FAILURE, errno, "exec: %s", cmd);
++}
++
++close(pfd_read[1]);
++
++if (pid < 0) {
++close(pfd_read[0]);
++error(0, errno, "fork: %s", cmd);
++return ret;
++}
++
++ret = fdopen(pfd_read[0], "r");
++return ret;
++}
++
++void format_time ( char * _cDest, double seconds, bool showall )
++{
++  // hours
++  int hr = ( (int) seconds / (60 * 60)) % 24;
++  // minutes
++  int min = ( (int) seconds / 60) % 60;
++  // seconds
++  double sec = seconds - (hr * (60 * 60)) - (min * 60);
++  if ( showall )
++  {
++if ( seconds < 0 )
++  sprintf(_cDest, "%2ch %2cm %2cs", '0', '0', '?');
++else
++  sprintf(_cDest, "%2dh %2dm %2ds", hr, min, (int) sec);
++  } else  if ( seconds >= 3600 )
++  {
++sprintf(_cDest, "%2dh %2dm %4.1fs", hr, min, sec);
++  } else if ( seconds >= 60 )
++  {
++sprintf(_cDest, "%2dm %4.1fs", min, sec);
++  } else
++  {
++sprintf(_cDest, "%4.1fs", sec);
++  }
++}
++
 +static void file_progress_bar ( char * _cDest, int _iBarLength, long 
_lProgress, long _lTotal )
 +{
 +double dPercent = (double) _lProgress / (double) _lTotal * 100.f;
@@ -68,18 +131,16 @@ diff -aur coreutils-8.32/src/copy.c 
coreutils-8.32-patched/src/copy.c
 +  return sprintf ( _cDst, "%5.1f %s", dSize, sUnit );
 +}
 +/* END progress mod */
-+
-+
 +
  /* Initial size of the cp.dest_info hash table.  */
  #define DEST_INFO_INITIAL_CAPACITY 61
  
-@@ -258,10 +324,11 @@
+@@ -299,14 +426,23 @@
 bytes read.  */
  static bool
  sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size,
-- size_t hole_size, bool punch_holes,
-+ size_t hole_size, bool punch_holes, bool move_mode,
+- size_t hole_size, bool punch_holes, bool allow_reflink,
++ size_t hole_size, bool punch_holes, bool allow_reflink, bool 
move_mode,
   char const *src_name, char const *dst_name,
   uintmax_t max_n_read, off_t *total_n_read,
 - bool *last_write_made_hole)
@@ -88,13 +149,25 @@ diff -aur coreutils-8.32/src/copy.c 
coreutils-8.32-patched/src/copy.c
  {
*last_write_made_hole = false;
*total_n_read = 0;
-@@ -270,6 +337,85 @@
+ 
++  /* BEGIN progress mod */
++  gettimeofday ( & g_oFStartTime, NULL );
++  g_iFTotalWritten = 0;
++  struct stat st;
++  stat(src_name, );
++  g_iFTotalSize = st.st_size/1024;
++  /* END progress mod */
++
+   /* If not looking for holes, use copy_file_range if functional,
+  but don't use if reflink disallowed as that may be implicit.  */
+   if ((! hole_size) && allow_reflink && functional_copy_file_range ())
+@@ -362,6 +498,103 @@
  
while (max_n_read)
  {
 +
++/* BEGIN progress mod */
 +if (progress) {
-+  /* BEGIN progress mod */
 +  /* update countdown */
 +  s_progress->iCountDown--;
 +  char * sProgressBar = s_progress->cProgressField[5];
@@ -108,6 +181,7 @@ diff -aur coreutils-8.32/src/copy.c 
coreutils-8.32-patched/src/copy.c
 +struct timeval cur_time;
 +gettimeofday ( & cur_time, NULL );
 +int cur_size = g_iTotalWritten + *total_n_read / 1024;
++int cur_fsize =

DISTFILES: bind: ERRORS: bind-9.18.1-P0.tar.xz bind-non-english-man-pages.tar.bz2 bind-hip.tar.gz named.root bind-9.18.1.tar.xz

2022-04-03 Thread hawk

Request by: hawk

wget -nv --no-iri --user-agent=PLD/distfiles -O 
./tmp/24dda54d-2e52-4298-9a96-28b46370630c/d7072b2d774077f37bff51580b3a577b/bind-9.18.1-P0.tar.xz
 ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz:
No such directory âisc/bind9/9.18.1-P0â.



wget -nv --no-iri --user-agent=PLD/distfiles -O 
./tmp/24dda54d-2e52-4298-9a96-28b46370630c/d7072b2d774077f37bff51580b3a577b/bind-9.18.1-P0.tar.xz
 ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz:
exited with code 8 (0x00)

wget -nv --no-iri --user-agent=PLD/distfiles --passive-ftp -O 
./tmp/24dda54d-2e52-4298-9a96-28b46370630c/d7072b2d774077f37bff51580b3a577b/bind-9.18.1-P0.tar.xz
 ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz:
No such directory âisc/bind9/9.18.1-P0â.



wget -nv --no-iri --user-agent=PLD/distfiles --passive-ftp -O 
./tmp/24dda54d-2e52-4298-9a96-28b46370630c/d7072b2d774077f37bff51580b3a577b/bind-9.18.1-P0.tar.xz
 ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz:
exited with code 8 (0x00)

FATAL: ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz 
(d7072b2d774077f37bff51580b3a577b) was not fetched correctly (wget -nv --no-iri 
--user-agent=PLD/distfiles -O 
./tmp/24dda54d-2e52-4298-9a96-28b46370630c/d7072b2d774077f37bff51580b3a577b/bind-9.18.1-P0.tar.xz
 ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz: No such directory 
âisc/bind9/9.18.1-P0â.


No such directory âisc/bind9/9.18.1-P0â.


): file fetched but has 0 length

Files fetched: 0

ALREADY GOT: 
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/bind-non-english-man-pages.tar.bz2
35b1dfaa12615c9802126ee833e0e7f7  bind-non-english-man-pages.tar.bz2
ALREADY GOT: no-url://bind-hip.tar.gz
62a8a67f51ff8db9fe815205416a1f62  bind-hip.tar.gz
ALREADY GOT: https://www.internic.net/domain/named.root
544504d19e2b71c259d2a09d231533aa  named.root
ALREADY GOT: ftp://ftp.isc.org/isc/bind9/9.18.1/bind-9.18.1.tar.xz
d7072b2d774077f37bff51580b3a577b  bind-9.18.1.tar.xz


-- 
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/bind] - drop ldap schema leftovers (removed with updated to 9.18.0)

2022-04-03 Thread hawk

commit c6814c87f9d8aaf5f3869f0d7f119ee50c5907a9
Author: Marcin Krol 
Date:   Sun Apr 3 21:35:42 2022 +0200

- drop ldap schema leftovers (removed with updated to 9.18.0)

 bind.spec | 9 -
 1 file changed, 9 deletions(-)
---
diff --git a/bind.spec b/bind.spec
index b8e6a08..616ea8b 100644
--- a/bind.spec
+++ b/bind.spec
@@ -54,9 +54,6 @@ Source2:  named.sysconfig
 Source3:   named.logrotate
 Source4:   
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source4-md5: 35b1dfaa12615c9802126ee833e0e7f7
-# formerly http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt (dead URL now)
-Source5:   dnszone-schema.txt
-# Source5-md5: 49fe799c6eca54ae227b22d57ebc1145
 Source6:   %{name}-hip.tar.gz
 # Source6-md5: 62a8a67f51ff8db9fe815205416a1f62
 Source7:   https://www.internic.net/domain/named.root
@@ -639,9 +636,3 @@ fi
 %{_libdir}/libisccfg.a
 %{_libdir}/libns.a
 %endif
-
-%if %{with ldap}
-%files -n openldap-schema-bind
-%defattr(644,root,root,755)
-%{_datadir}/openldap/schema/dnszone.schema
-%endif


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bind.git/commitdiff/c6814c87f9d8aaf5f3869f0d7f119ee50c5907a9

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: bind: ERRORS: bind-9.18.1-P0.tar.xz bind-non-english-man-pages.tar.bz2 dnszone-schema.txt bind-hip.tar.gz named.root bind-9.18.1.tar.xz

2022-04-03 Thread hawk

Request by: hawk

wget -nv --no-iri --user-agent=PLD/distfiles -O 
./tmp/e20ecedd-2309-4b43-a940-9efe1ab2a07e/d7072b2d774077f37bff51580b3a577b/bind-9.18.1-P0.tar.xz
 ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz:
No such directory âisc/bind9/9.18.1-P0â.



wget -nv --no-iri --user-agent=PLD/distfiles -O 
./tmp/e20ecedd-2309-4b43-a940-9efe1ab2a07e/d7072b2d774077f37bff51580b3a577b/bind-9.18.1-P0.tar.xz
 ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz:
exited with code 8 (0x00)

wget -nv --no-iri --user-agent=PLD/distfiles --passive-ftp -O 
./tmp/e20ecedd-2309-4b43-a940-9efe1ab2a07e/d7072b2d774077f37bff51580b3a577b/bind-9.18.1-P0.tar.xz
 ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz:
No such directory âisc/bind9/9.18.1-P0â.



wget -nv --no-iri --user-agent=PLD/distfiles --passive-ftp -O 
./tmp/e20ecedd-2309-4b43-a940-9efe1ab2a07e/d7072b2d774077f37bff51580b3a577b/bind-9.18.1-P0.tar.xz
 ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz:
exited with code 8 (0x00)

FATAL: ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz 
(d7072b2d774077f37bff51580b3a577b) was not fetched correctly (wget -nv --no-iri 
--user-agent=PLD/distfiles -O 
./tmp/e20ecedd-2309-4b43-a940-9efe1ab2a07e/d7072b2d774077f37bff51580b3a577b/bind-9.18.1-P0.tar.xz
 ftp://ftp.isc.org/isc/bind9/9.18.1-P0/bind-9.18.1-P0.tar.xz: No such directory 
âisc/bind9/9.18.1-P0â.


No such directory âisc/bind9/9.18.1-P0â.


): file fetched but has 0 length

Files fetched: 0

ALREADY GOT: 
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/bind-non-english-man-pages.tar.bz2
35b1dfaa12615c9802126ee833e0e7f7  bind-non-english-man-pages.tar.bz2
ALREADY GOT: no-url://dnszone-schema.txt
49fe799c6eca54ae227b22d57ebc1145  dnszone-schema.txt
ALREADY GOT: no-url://bind-hip.tar.gz
62a8a67f51ff8db9fe815205416a1f62  bind-hip.tar.gz
ALREADY GOT: https://www.internic.net/domain/named.root
544504d19e2b71c259d2a09d231533aa  named.root
ALREADY GOT: ftp://ftp.isc.org/isc/bind9/9.18.1/bind-9.18.1.tar.xz
d7072b2d774077f37bff51580b3a577b  bind-9.18.1.tar.xz


-- 
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/bind] - separate subpackage for plugins

2022-04-03 Thread hawk

commit 382d807794da0788ffa167b029ff0baa30e523f5
Author: Marcin Krol 
Date:   Sun Apr 3 21:22:23 2022 +0200

- separate subpackage for plugins

 bind.spec | 16 
 1 file changed, 16 insertions(+)
---
diff --git a/bind.spec b/bind.spec
index 656b83f..b8e6a08 100644
--- a/bind.spec
+++ b/bind.spec
@@ -201,6 +201,20 @@ BIND (Berkeley Internet Name Domain) є реалізацією протокол
 Конфігураційні файли, ща настроюють BIND на роботу в режимі простого
 кешируючого серверу, включені в пакет caching-nameserver.
 
+%package plugins
+Summary:   Plugins for Bind DNS name server
+Summary(pl.UTF-8): Wtyczki dla serwera nazw DNS Bind
+Group: Networking/Utilities
+Requires:  %{name} = %{epoch}:%{version}-%{release}
+
+%description plugins
+Plugins for extending of query processing functionality of Bind DNS name
+server.
+
+%description plugins -l pl.UTF-8
+Wtyczki rozszerzające funkcjonalność przetwarzania zapytań przez serwer
+nazw DNS Bind.
+
 %package utils
 Summary:   DNS utils - host, dig, dnsquery, nslookup
 Summary(de.UTF-8): DNS-Utils - Host, Dig, Dnsquery, Nslookup
@@ -538,6 +552,8 @@ fi
 
 %attr(770,root,named) %dir %{_var}/run/named
 
+%files plugins
+%defattr(644,root,root,755)
 %dir %{_libdir}/bind
 %attr(755,root,root) %{_libdir}/bind/filter-a.so
 %attr(755,root,root) %{_libdir}/bind/filter-.so


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bind.git/commitdiff/382d807794da0788ffa167b029ff0baa30e523f5

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: dhcp: ERRORS: dhcp-4.4.3-P1.tar.gz dhcp-4.4.3.tar.gz

2022-04-03 Thread hawk

Request by: hawk

wget -nv --no-iri --user-agent=PLD/distfiles -O 
./tmp/abd6f5fd-147d-49e7-aa21-8813ba36e03a/9076af4cc1293dde5a7c6cae7de6ab45/dhcp-4.4.3-P1.tar.gz
 ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz:
No such directory âisc/dhcp/4.4.3-P1â.



wget -nv --no-iri --user-agent=PLD/distfiles -O 
./tmp/abd6f5fd-147d-49e7-aa21-8813ba36e03a/9076af4cc1293dde5a7c6cae7de6ab45/dhcp-4.4.3-P1.tar.gz
 ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz:
exited with code 8 (0x00)

wget -nv --no-iri --user-agent=PLD/distfiles --passive-ftp -O 
./tmp/abd6f5fd-147d-49e7-aa21-8813ba36e03a/9076af4cc1293dde5a7c6cae7de6ab45/dhcp-4.4.3-P1.tar.gz
 ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz:
No such directory âisc/dhcp/4.4.3-P1â.



wget -nv --no-iri --user-agent=PLD/distfiles --passive-ftp -O 
./tmp/abd6f5fd-147d-49e7-aa21-8813ba36e03a/9076af4cc1293dde5a7c6cae7de6ab45/dhcp-4.4.3-P1.tar.gz
 ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz:
exited with code 8 (0x00)

FATAL: ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz 
(9076af4cc1293dde5a7c6cae7de6ab45) was not fetched correctly (wget -nv --no-iri 
--user-agent=PLD/distfiles -O 
./tmp/abd6f5fd-147d-49e7-aa21-8813ba36e03a/9076af4cc1293dde5a7c6cae7de6ab45/dhcp-4.4.3-P1.tar.gz
 ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz: No such directory 
âisc/dhcp/4.4.3-P1â.


No such directory âisc/dhcp/4.4.3-P1â.


): file fetched but has 0 length

Files fetched: 1

STORED: ftp://ftp.isc.org/isc/dhcp/4.4.3/dhcp-4.4.3.tar.gz
9076af4cc1293dde5a7c6cae7de6ab45  dhcp-4.4.3.tar.gz
Size: 10078953 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/bacula] - fix dist version

2022-04-03 Thread hawk

commit d17015c03364eebda1aea5ab16699cb55bdf11ba
Author: Marcin Krol 
Date:   Sun Apr 3 12:36:20 2022 +

- fix dist version

 bacula-branding.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/bacula-branding.patch b/bacula-branding.patch
index f0e19f9..966d4ff 100644
--- a/bacula-branding.patch
+++ b/bacula-branding.patch
@@ -7,7 +7,7 @@ diff -ur bacula-11.0.6.orig/autoconf/configure.in 
bacula-11.0.6/autoconf/configu
;;
 +pld-linux)
 +   DISTNAME="PLD/Linux"
-+   DISTVER=$(awk ' { print $1 " " $4  } ' /etc/pld-release 2> /dev/null)
++   DISTVER=$(awk ' { print $1 " " $5  } ' /etc/pld-release 2> /dev/null)
 +   TAPEDRIVE="/dev/nst0"
 +   PSCMD="ps -e -o pid,command"
 +   PFILES="${PFILES} \


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bacula.git/commitdiff/d17015c03364eebda1aea5ab16699cb55bdf11ba

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: bacula: bacula-11.0.6.tar.gz libs3-20200523.tar.gz

2022-04-03 Thread hawk

Request by: hawk


Files fetched: 2

STORED: http://downloads.sourceforge.net/bacula/bacula-11.0.6.tar.gz
0e3cd4e29878b09ae4554bae64785736  bacula-11.0.6.tar.gz
Size: 5986763 bytes
STORED: https://www.bacula.org/downloads/libs3-20200523.tar.gz
ca97bc4133a21981139181ec8571f202  libs3-20200523.tar.gz
Size: 117367 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/bacula] - updated to 11.0.6, removed unused patches

2022-04-03 Thread hawk

commit 032c586f190ec1593d518827362abf9832299c43
Author: Marcin Krol 
Date:   Sun Apr 3 12:16:06 2022 +

- updated to 11.0.6, removed unused patches

 bacula-branding.patch|   8 +-
 bacula-desktop.patch |   7 +-
 bacula-mtx-changer.patch |   6 +-
 bacula-no_lockmgr.patch  |  20 +--
 bacula-wx-console-build.patch| 236 ---
 bacula.spec  |  37 +++---
 libs3-curl.patch |  26 ++--
 make_catalog_backup-setup-home.patch |   6 +-
 wxWidgets3.patch |  79 
 x32.patch|  18 +--
 10 files changed, 65 insertions(+), 378 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index 4c980e8..56b57b1 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -17,19 +17,19 @@
 %endif
 
 # Bacula requires this specific, custom version
-%definelibs3_version   20181010
+%definelibs3_version   20200523
 
 Summary:   Bacula - The Network Backup Solution
 Summary(pl.UTF-8): Bacula - rozwiązanie do wykonywania kopii zapasowych po 
sieci
 Name:  bacula
-Version:   9.4.2
-Release:   5
+Version:   11.0.6
+Release:   1
 License:   AGPL v3
 Group: Networking/Utilities
 Source0:   
http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5: 376e67b16cfa7254a571710233b6
+# Source0-md5: 0e3cd4e29878b09ae4554bae64785736
 Source1:   https://www.bacula.org/downloads/libs3-%{libs3_version}.tar.gz
-# Source1-md5: 08fbaea463b12974ebf7f4c2b336c38c
+# Source1-md5: ca97bc4133a21981139181ec8571f202
 Source10:  %{name}-dir.init
 Source11:  %{name}-fd.init
 Source12:  %{name}-sd.init
@@ -65,6 +65,7 @@ BuildRequires:python-modules
 %if %{with qt}
 BuildRequires: Qt5Core-devel
 BuildRequires: Qt5Gui-devel
+BuildRequires: Qt5Widgets-devel
 BuildRequires: qt5-build
 BuildRequires: qt5-qmake
 %endif
@@ -717,11 +718,11 @@ ln -sf libbaccats-%{1}-%{version}.so 
%{_libdir}/libbaccats-%{version}.so || : \
 # do not remove bsmtp from files. Fix build if it is not installed.
 %attr(755,root,root) %{_sbindir}/bsmtp
 %attr(755,root,root) %{_sbindir}/btraceback
-%attr(755,root,root) %{_libdir}/libbac-9*.so
-%attr(755,root,root) %{_libdir}/libbacsd-9*.so
-%attr(755,root,root) %{_libdir}/libbaccfg-9*.so
-%attr(755,root,root) %{_libdir}/libbacfind-9*.so
-%attr(755,root,root) %{_libdir}/libbacsql-9*.so
+%attr(755,root,root) %{_libdir}/libbac-11*.so
+%attr(755,root,root) %{_libdir}/libbacsd-11*.so
+%attr(755,root,root) %{_libdir}/libbaccfg-11*.so
+%attr(755,root,root) %{_libdir}/libbacfind-11*.so
+%attr(755,root,root) %{_libdir}/libbacsql-11*.so
 %{_mandir}/man8/bacula.8*
 %{_mandir}/man1/bsmtp.1*
 %{_mandir}/man8/btraceback.8*
@@ -765,9 +766,9 @@ ln -sf libbaccats-%{1}-%{version}.so 
%{_libdir}/libbaccats-%{version}.so || : \
 %attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_postgresql_*
 %attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_catalog_backup
-%attr(755,root,root) %{_libdir}/libbaccats-postgresql-9*.so
+%attr(755,root,root) %{_libdir}/libbaccats-postgresql-11*.so
 
-%ghost %attr(755,root,root) %{_libdir}/libbaccats-9*.so
+%ghost %attr(755,root,root) %{_libdir}/libbaccats-11*.so
 %ghost %{_libexecdir}/%{name}/create_bacula_database
 %ghost %{_libexecdir}/%{name}/drop_bacula_tables
 %ghost %{_libexecdir}/%{name}/drop_bacula_database
@@ -787,9 +788,9 @@ ln -sf libbaccats-%{1}-%{version}.so 
%{_libdir}/libbaccats-%{version}.so || : \
 %attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_mysql_*
 %attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_catalog_backup
-%attr(755,root,root) %{_libdir}/libbaccats-mysql-9*.so
+%attr(755,root,root) %{_libdir}/libbaccats-mysql-11*.so
 
-%ghost %attr(755,root,root) %{_libdir}/libbaccats-9*.so
+%ghost %attr(755,root,root) %{_libdir}/libbaccats-11*.so
 %ghost %{_libexecdir}/%{name}/create_bacula_database
 %ghost %{_libexecdir}/%{name}/drop_bacula_tables
 %ghost %{_libexecdir}/%{name}/drop_bacula_database
@@ -809,9 +810,9 @@ ln -sf libbaccats-%{1}-%{version}.so 
%{_libdir}/libbaccats-%{version}.so || : \
 %attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite3_*
 %attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_catalog_backup
-%attr(755,root,root) %{_libdir}/libbaccats-sqlite3-9*.so
+%attr(755,root,root) %{_libdir}/libbaccats-sqlite3-11*.so
 
-%ghost %attr(755,root,root) %{_libdir}/libbaccats-9*.so
+%ghost %attr(755,root,root) %{_libdir}/libbaccats-11*.so
 %ghost %{_libexecdir}/%{name}/create_bacula_database
 %ghost %{_libexecdir}/%{name}/drop_bacula_tables
 %ghost %{_libexecdir}/%{name}/drop_bacula_database
@@ -854,9 +855,9 @@ ln -sf libbaccats-%{1}-%{version}.so

DISTFILES: amavisd-new: amavis-v2.12.2.tar.bz2

2022-04-03 Thread hawk

Request by: hawk


Files fetched: 1

STORED: 
https://gitlab.com/amavis/amavis/-/archive/v2.12.2/amavis-v2.12.2.tar.bz2
d2ccce027ff4e8502326638e9ef2142b  amavis-v2.12.2.tar.bz2
Size: 874946 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/amavisd-new] - updated to 2.12.2

2022-04-03 Thread hawk

commit 167d3ce4dea1427852022158f8c339b77b1cf12c
Author: Marcin Krol 
Date:   Sun Apr 3 12:51:46 2022 +0200

- updated to 2.12.2

 amavisd-new-config.patch  | 15 ---
 amavisd-new-tools-dbdir.patch | 15 ---
 amavisd-new.spec  |  5 +++--
 3 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/amavisd-new.spec b/amavisd-new.spec
index b9130f0..35b324e 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,16 +3,17 @@
 # - Add polish info mail templates
 # - move amavis part of tmpwatch configuration from tmpwatch.spec
 #
+%define_debugsource_packages   0
 Summary:   A Mail Virus Scanner with SpamAssassin support - daemon
 Summary(pl.UTF-8): Antywirusowy skaner poczty elektronicznej z obsługą 
SpamAssasina - demon
 Name:  amavisd-new
-Version:   2.12.0
+Version:   2.12.2
 Release:   1
 Epoch: 1
 License:   GPL
 Group: Applications/Mail
 Source0:   
https://gitlab.com/amavis/amavis/-/archive/v%{version}/amavis-v%{version}.tar.bz2
-# Source0-md5: 67cdd043d5d7046ec599556ec10f
+# Source0-md5: d2ccce027ff4e8502326638e9ef2142b
 Source1:   %{name}.init
 Source2:   %{name}.tmpfiles
 Source3:   %{name}.tmpwatch
diff --git a/amavisd-new-config.patch b/amavisd-new-config.patch
index 667308c..14a0257 100644
--- a/amavisd-new-config.patch
+++ b/amavisd-new-config.patch
@@ -1,6 +1,7 @@
 amavisd-new-2.7.0/amavisd.conf~2011-07-01 19:21:01.0 +0300
-+++ amavisd-new-2.7.0/amavisd.conf 2011-08-08 13:03:11.992905314 +0300
-@@ -10,32 +10,32 @@
+diff -urp amavis-v2.12.1.orig/amavisd.conf amavis-v2.12.1/amavisd.conf
+--- amavis-v2.12.1.orig/amavisd.conf   2020-11-13 13:55:37.0 +0100
 amavis-v2.12.1/amavisd.conf2021-01-24 21:25:54.841592502 +0100
+@@ -10,32 +10,32 @@ use strict;
  # COMMONLY ADJUSTED SETTINGS:
  
  # @bypass_virus_checks_maps = (1);  # controls running of anti-virus code
@@ -42,7 +43,7 @@
  #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
  
  $log_level = 0;  # verbosity 0..5, -d
-@@ -51,7 +51,8 @@
+@@ -55,7 +55,8 @@ $enable_dkim_signing = 1;# load DKIM
  @mynetworks = qw( 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10
10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
  
@@ -52,8 +53,8 @@
 # option(s) -p overrides $inet_socket_port and $unix_socketname
  
  $inet_socket_port = 10024;   # listen on this local TCP port(s)
-@@ -370,16 +371,15 @@
- #   qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m
+@@ -382,16 +383,15 @@ $banned_filename_re = new_RE(
+ #   qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ],
  # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
  
 -# ### http://www.clamav.net/
@@ -78,7 +79,7 @@
  
  # ### http://www.clamav.net/ and CPAN  (memory-hungry! clamd is preferred)
  # # note that Mail::ClamAV requires perl to be build with threading!
-@@ -566,16 +566,21 @@
+@@ -580,16 +580,21 @@ $banned_filename_re = new_RE(
  # NOTE: requires suid wrapper around inocmd32; consider flag: -mod 
reviewer
  # see http://marc.theaimsgroup.com/?l=amavis-user=109229779912783
  
diff --git a/amavisd-new-tools-dbdir.patch b/amavisd-new-tools-dbdir.patch
index b60072a..4fe74d1 100644
--- a/amavisd-new-tools-dbdir.patch
+++ b/amavisd-new-tools-dbdir.patch
@@ -1,6 +1,7 @@
 amavisd-new-2.6.0/amavisd-agent.orig2008-04-10 21:47:12.0 +0300
-+++ amavisd-new-2.6.0/amavisd-agent2008-05-07 13:48:25.0 +0300
-@@ -50,7 +50,7 @@
+diff -urp amavis-v2.12.1.orig/amavisd-agent amavis-v2.12.1/amavisd-agent
+--- amavis-v2.12.1.orig/amavisd-agent  2020-11-13 13:55:37.0 +0100
 amavis-v2.12.1/amavisd-agent   2021-01-24 21:28:13.409592502 +0100
+@@ -53,7 +53,7 @@ use BerkeleyDB;
  
  my($dbfile) = 'snmp.db';
  my($db_home) =  # DB databases directory
@@ -9,9 +10,10 @@
  
  my($wakeuptime) = 10;  # -w, sleep time in seconds, may be fractional
  my($repeatcount);  # -c, repeat count (when defined)
 amavisd-new-2.6.0/amavisd-nanny.orig2008-03-29 00:55:02.0 +0200
-+++ amavisd-new-2.6.0/amavisd-nanny2008-05-07 13:49:19.0 +0300
-@@ -58,7 +58,7 @@
+diff -urp amavis-v2.12.1.orig/amavisd-nanny amavis-v2.12.1/amavisd-nanny
+--- amavis-v2.12.1.orig/amavisd-nanny  2020-11-13 13:55:37.0 +0100
 amavis-v2.12.1/amavisd-nanny   2021-01-24 21:28:13.409592502 +0100
+@@ -61,7 +61,7 @@ my($activettl) = 10*60; # stuck active c
  
  my($dbfile) = 'nanny.db';
  my($db_home) =  # DB databases directory
@@ -20,4 +22,3 @@
  my($wakeuptime) = 2;  # -w, sleep time in seconds, may be fractional
  my($repeatcount); # -c, repeat count (when defined)
  
-


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/amavisd-new.git/commitdiff/167d3ce4dea1427852022158f8c339b77b1cf12c

___
pld-cvs-commit

[packages/audit] - removed %triggerpostun to make it build with rpm.org - upstream fix for missing ipx.h in newer ker

2022-04-02 Thread hawk

commit 1dc8b4bb68661158c066456900eff2d7e54d9ed6
Author: Marcin Krol 
Date:   Sat Apr 2 20:38:16 2022 +0200

- removed %triggerpostun to make it build with rpm.org
- upstream fix for missing ipx.h in newer kernel headers

 audit.spec| 23 +++
 ipx_fix.patch | 48 
 2 files changed, 51 insertions(+), 20 deletions(-)
---
diff --git a/audit.spec b/audit.spec
index 5c1999a..24c6b0c 100644
--- a/audit.spec
+++ b/audit.spec
@@ -21,7 +21,7 @@ Summary:  User space tools for 2.6 kernel auditing
 Summary(pl.UTF-8): Narzędzia przestrzeni użytkownika do audytu jąder 2.6
 Name:  audit
 Version:   2.8.5
-Release:   4
+Release:   5
 License:   GPL v2+
 Group: Daemons
 Source0:   https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
@@ -37,6 +37,7 @@ Patch5:   %{name}-no-refusemanualstop.patch
 Patch6:%{name}-cronjob.patch
 Patch7:golang-paths.patch
 Patch8:gcc10.patch
+Patch9:ipx_fix.patch
 URL:   http://people.redhat.com/sgrubb/audit/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.12.6
@@ -204,6 +205,7 @@ Interfejs Pythona 3.x do biblioteki libaudit.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %if %{without python}
 sed 's#[^ ]*swig/[^ ]*/Makefile ##g' -i configure.ac
@@ -290,25 +292,6 @@ fi
 %postun
 %systemd_reload
 
-%triggerpostun -- %{name} < 2.2-2
-%systemd_trigger auditd.service
-
-%triggerpostun -- %{name} < 2.3-1
-if [ -e %{_sysconfdir}/audit/audit.rules.rpmsave ] ; then
-   %{__mv} %{_sysconfdir}/audit/audit.rules{.rpmsave,}
-fi
-%service auditd restart "audit daemon"
-%systemd_post auditd.service
-
-%triggerpostun -- %{name} < 2.5-1
-if [ -f %{_sysconfdir}/audit/rules.d/audit.rules.rpmsave ]; then
-%banner %{name} -e <
+ #include 
+ #include 
+-#include// FIXME: remove when ipx.h is fixed
+-#include 
++#ifdef HAVE_IPX_HEADERS
++  #include// FIXME: remove when ipx.h is fixed
++  #include 
++#endif
+ #include 
+ #include 
+ #include 
+@@ -1151,6 +1153,7 @@
+ x->sax25_call.ax25_call[6]);
+ }
+ break;
++#ifdef HAVE_IPX_HEADERS
+ case AF_IPX:
+ {
+ const struct sockaddr_ipx *ip =
+@@ -1160,6 +1163,7 @@
+   str, ip->sipx_port, ip->sipx_network);
+ }
+ break;
++#endif
+ case AF_ATMPVC:
+ {
+ const struct sockaddr_atmpvc* at =
+diff -ur audit-2.8.5.orig/configure.ac audit-2.8.5/configure.ac
+--- audit-2.8.5.orig/configure.ac  2022-04-02 20:33:47.114507326 +0200
 audit-2.8.5/configure.ac   2022-04-02 20:34:04.713548373 +0200
+@@ -398,6 +398,12 @@
+   AC_DEFINE_UNQUOTED(HAVE_LIBWRAP, [], Define if tcp_wrappers support is 
enabled )
+ fi
+ 
++# linux/ipx.h - deprecated in 2018
++AC_CHECK_HEADER(linux/ipx.h, ipx_headers=yes, ipx_headers=no)
++if test $ipx_headers = yes ; then
++  AC_DEFINE(HAVE_IPX_HEADERS,1,[IPX packet interpretation])
++fi
++
+ # See if we want to support lower capabilities for plugins
+ LIBCAP_NG_PATH
+ 


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/audit.git/commitdiff/1dc8b4bb68661158c066456900eff2d7e54d9ed6

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/haveged] - init script

2022-04-02 Thread hawk

commit ba031a184bf302d3c1a3d97ae9e3a4269f4602da
Author: Marcin Krol 
Date:   Sat Apr 2 14:25:01 2022 +0200

- init script

 haveged.init | 91 
 1 file changed, 91 insertions(+)
---
diff --git a/haveged.init b/haveged.init
new file mode 100644
index 000..170e1e2
--- /dev/null
+++ b/haveged.init
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# haveged:   entropy daemon
+#
+# chkconfig: - 19 81
+# description:  havege entropy daemon
+#
+# processname: haveged
+#
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source config
+if [ -f /etc/sysconfig/haveged ] ; then
+   . /etc/sysconfig/haveged
+fi
+
+start() {
+if [ -f /var/lock/subsys/haveged ]; then
+   msg_already_running "haveged"
+   return
+   fi
+
+   umask 077
+   msg_starting "haveged"
+   daemon /usr/sbin/haveged -w 1024 -v 1
+   RETVAL=$?
+   [ $RETVAL -eq 0 ] && touch /var/lock/subsys/haveged
+}
+
+stop() {
+   if [ ! -f /var/lock/subsys/haveged ]; then
+   msg_not_running "haveged"
+   return
+   fi
+
+   msg_stopping "haveged"
+   killproc haveged
+   rm -f /var/lock/subsys/haveged
+}
+
+
+reload() {
+   if [ ! -f /var/lock/subsys/haveged ]; then
+   msg_not_running "haveged"
+   RETVAL=7
+   return
+   fi
+
+   msg_reloading haveged
+   killproc haveged -HUP
+   RETVAL=$?
+}
+
+condrestart() {
+   if [ ! -f /var/lock/subsys/haveged ]; then
+   msg_not_running "haveged"
+   RETVAL=$1
+   return
+   fi
+   stop
+   start
+}
+
+# See how we were called.
+case "$1" in
+  start)
+   start
+   ;;
+  stop)
+   stop
+   ;;
+  restart)
+   stop
+   start
+   ;;
+  try-restart)
+   condrestart 0
+   ;;
+  reload|force-reload)
+   reload
+   ;;
+  status)
+   status --pidfile /var/run/haveged.pid haveged
+   ;;
+  *)
+   msg_usage "$0 
{start|stop|restart|try-restart|reload|force-reload|status}"
+   exit 3
+esac
+exit $RETVAL


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/haveged.git/commitdiff/ba031a184bf302d3c1a3d97ae9e3a4269f4602da

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/haveged] - added init script for SysV, allow building w/o systemd

2022-04-02 Thread hawk

commit 5a97854308f1f171d272dc0419e0db75d6971bdd
Author: Marcin Krol 
Date:   Sat Apr 2 14:24:12 2022 +0200

- added init script for SysV, allow building w/o systemd

 haveged.spec | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/haveged.spec b/haveged.spec
index b5edcc2..0ceeb9b 100644
--- a/haveged.spec
+++ b/haveged.spec
@@ -1,3 +1,4 @@
+%bcond_without systemd # build without systemd
 Summary:   A Linux entropy source using the HAVEGE algorithm
 Name:  haveged
 Version:   1.9.15
@@ -6,12 +7,13 @@ License:  GPL v3+
 Group: Daemons
 Source0:   https://github.com/jirka-h/haveged/archive/v%{version}.tar.gz
 # Source0-md5: 9298cbdfb37ab84bdb710f042373a354
+Source1:   %{name}.init
 URL:   http://www.irisa.fr/caps/projects/hipsor/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: rpmbuild(macros) >= 1.644
-BuildRequires: systemd-devel
+%{?with_systemd:BuildRequires: systemd-devel}
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:  systemd-units >= 38
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -71,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{systemdunitdir}
 sed -e 's:@SBIN_DIR@:%{_sbindir}:g' contrib/Fedora/haveged.service > 
$RPM_BUILD_ROOT%{systemdunitdir}/haveged.service
 
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/haveged
+
 # We don't ship .la files.
 rm $RPM_BUILD_ROOT%{_libdir}/libhavege.la
 
@@ -81,9 +86,15 @@ rm -rf $RPM_BUILD_ROOT
 %postunlibs -p /sbin/ldconfig
 
 %post
+/sbin/chkconfig --add haveged
+%service haveged restart
 %systemd_post haveged.service
 
 %preun
+if [ "$1" = "0" ]; then
+   %service haveged stop
+   /sbin/chkconfig --del haveged
+fi
 %systemd_preun haveged.service
 
 %postun
@@ -92,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README contrib/build/havege_sample.c
+%attr(754,root,root) /etc/rc.d/init.d/haveged
 %attr(755,root,root) %{_sbindir}/haveged
 %{_mandir}/man8/haveged.8*
 %{systemdunitdir}/haveged.service


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/haveged.git/commitdiff/5a97854308f1f171d272dc0419e0db75d6971bdd

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: dpkg: dpkg_1.21.7.tar.xz

2022-04-02 Thread hawk

Request by: hawk


Files fetched: 1

STORED: http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.21.7.tar.xz
2c6686bd991810ce8a87469a7f20b415  dpkg_1.21.7.tar.xz
Size: 5082524 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/dpkg] - updated to 1.21.7

2022-04-02 Thread hawk

commit b5ec5adf3f74016ae1d2df8b3653152fefe1b85b
Author: Marcin Krol 
Date:   Sat Apr 2 13:41:53 2022 +0200

- updated to 1.21.7

 dpkg.spec | 57 ++---
 1 file changed, 54 insertions(+), 3 deletions(-)
---
diff --git a/dpkg.spec b/dpkg.spec
index a77fe09..368026f 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -5,12 +5,12 @@
 Summary:   Package maintenance system for Debian Linux
 Summary(pl.UTF-8): Program do obsługi pakietów Debiana
 Name:  dpkg
-Version:   1.18.10
+Version:   1.21.7
 Release:   1
 License:   GPL v2+
 Group: Applications/File
 Source0:   
http://ftp.debian.org/debian/pool/main/d/dpkg/%{name}_%{version}.tar.xz
-# Source0-md5: ccff17730c0964428fc186ded2f2f401
+# Source0-md5: 2c6686bd991810ce8a87469a7f20b415
 Patch0:%{name}-md5.patch
 URL:   http://packages.debian.org/search?keywords=dpkg
 BuildRequires: bzip2-devel
@@ -70,6 +70,20 @@ dowiązaniach symbolicznych obejmujących system alternatyw. 
System
 alternatyw to reimplementacja systemu alternatyw ("alternatives") z
 Debiana.
 
+%package -n zsh-completion-dpkg
+Summary:ZSH completion for dpkg command
+Summary(pl.UTF-8):  Dopełnianianie parametrów w ZSH dla polecenia dpkg
+Group:  Applications/Shells
+Requires:   %{name} = %{version}-%{release}
+Requires:   zsh
+BuildArch:  noarch
+
+%description -n zsh-completion-dpkg
+ZSH completion for dpkg command.
+
+%description -n zsh-completion-dpkg -l pl.UTF-8
+Dopełnianianie parametrów w ZSH dla polecenia dpkg.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -80,6 +94,7 @@ Debiana.
 %configure \
ac_cv_header_md5_h=no \
PO4A="true" \
+   --disable-devel-docs \
--disable-dselect \
%{!?with_alternatives:--disable-update-alternatives} \
--disable-silent-rules \
@@ -97,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/alternatives/README
 %endif
 
+# packaged as doc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc/dpkg
+
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libdpkg.la
 
@@ -113,6 +131,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README THANKS TODO
 %attr(755,root,root) %{_bindir}/dpkg*
+%attr(755,root,root) %{_sbindir}/dpkg-fsys-usrunmess
 %dir %{_sysconfdir}/dpkg
 %dir %{_sysconfdir}/dpkg/dpkg.cfg.d
 
@@ -120,8 +139,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dpkg/abitable
 %{_datadir}/dpkg/cputable
 %{_datadir}/dpkg/ostable
-%{_datadir}/dpkg/triplettable
+%{_datadir}/dpkg/tupletable
 %{_datadir}/dpkg/*.mk
+%{_datadir}/dpkg/*.specs
+
+%dir %{_datadir}/dpkg/sh
+%{_datadir}/dpkg/sh/dpkg-error.sh
+
+%dir %{_libexecdir}/dpkg
+%attr(755,root,root) %{_libexecdir}/dpkg/dpkg-db-backup
 
 %{perl_vendorlib}/Dpkg.pm
 %{perl_vendorlib}/Dpkg
@@ -137,16 +163,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/deb*.5*
 %{_mandir}/man5/dpkg.cfg.5*
 %{_mandir}/man5/dsc.5*
+%{_mandir}/man7/deb-version.7*
+%{_mandir}/man8/dpkg-fsys-usrunmess.8.*
 %lang(de) %{_mandir}/de/man1/dpkg*.1*
 %lang(de) %{_mandir}/de/man5/deb*.5*
 %lang(de) %{_mandir}/de/man5/dpkg.cfg.5*
 %lang(de) %{_mandir}/de/man5/dsc.5*
+%lang(de) %{_mandir}/de/man7/deb-version.7*
+%lang(de) %{_mandir}/de/man8/dpkg-fsys-usrunmess.8.*
 %lang(es) %{_mandir}/es/man1/dpkg*.1*
 %lang(es) %{_mandir}/es/man5/deb*.5*
 %lang(es) %{_mandir}/es/man5/dpkg.cfg.5*
 %lang(fr) %{_mandir}/fr/man1/dpkg*.1*
 %lang(fr) %{_mandir}/fr/man5/deb*.5*
 %lang(fr) %{_mandir}/fr/man5/dpkg.cfg.5*
+%lang(fr) %{_mandir}/fr/man5/dsc.5*
+%lang(fr) %{_mandir}/fr/man7/deb-version.7*
+%lang(hu) %{_mandir}/hu/man5/dpkg.cfg.5*
 %lang(it) %{_mandir}/it/man1/dpkg*.1*
 %lang(it) %{_mandir}/it/man5/deb*.5*
 %lang(it) %{_mandir}/it/man5/dpkg.cfg.5*
@@ -156,17 +189,31 @@ rm -rf $RPM_BUILD_ROOT
 %lang(nl) %{_mandir}/nl/man1/dpkg*.1*
 %lang(nl) %{_mandir}/nl/man5/deb*.5*
 %lang(nl) %{_mandir}/nl/man5/dpkg.cfg.5*
+%lang(nl) %{_mandir}/nl/man5/dsc.5*
+%lang(nl) %{_mandir}/nl/man7/deb-version.7*
+%lang(nl) %{_mandir}/nl/man8/dpkg-fsys-usrunmess.8.*
 %lang(pl) %{_mandir}/pl/man1/dpkg*.1*
 %lang(pl) %{_mandir}/pl/man5/deb*.5*
 %lang(pl) %{_mandir}/pl/man5/dpkg.cfg.5*
+%lang(pt) %{_mandir}/pt/man1/dpkg*.1*
+%lang(pt) %{_mandir}/pt/man5/deb*.5*
+%lang(pt) %{_mandir}/pt/man5/dpkg.cfg.5*
+%lang(pt) %{_mandir}/pt/man5/dsc.5*
+%lang(pt) %{_mandir}/pt/man7/deb-version.7*
+%lang(pt) %{_mandir}/pt/man8/dpkg-fsys-usrunmess.8.*
 %lang(sv) %{_mandir}/sv/man1/dpkg*.1*
 %lang(sv) %{_mandir}/sv/man5/deb*.5*
 %lang(sv) %{_mandir}/sv/man5/dpkg.cfg.5*
+%lang(sv) %{_mandir}/sv/man5/dsc.5*
+%lang(sv) %{_mandir}/sv/man7/deb-version.7*
+%lang(sv) %{_mandir}/sv/man8/dpkg-fsys-usrunmess.8.*
 
 %files -n libdpkg-devel
 %defattr(644,root,root,755)
+%doc doc/README.* doc/*.txt
 %{_libdir}/libdpkg.a
 %{_includedir}/dpkg
+%{_aclocaldir}/dpkg*.m4
 %{_pkgconfigdir}/libdpkg.pc
 
 %if %{with alternatives}
@@ -184,3 +231,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sv)

[packages/gyp] - cosmetics

2022-04-02 Thread hawk

commit 368464aa8c4a0a09c43f2c7ba4e4be06606d2932
Author: Marcin Krol 
Date:   Sat Apr 2 10:31:07 2022 +

- cosmetics

 gyp.spec | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gyp.spec b/gyp.spec
index f2121d2..e015359 100644
--- a/gyp.spec
+++ b/gyp.spec
@@ -128,18 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS LICENSE
 %attr(755,root,root) %{_bindir}/gyp
 
-%if %{with python3}
-%files -n python3-%{name}
-%defattr(644,root,root,755)
-%dir %{py3_sitescriptdir}/gyp
-%dir %{py3_sitescriptdir}/gyp/generator
-%{py3_sitescriptdir}/gyp/*.py
-%{py3_sitescriptdir}/gyp/__pycache__
-%{py3_sitescriptdir}/gyp/generator/*.py
-%{py3_sitescriptdir}/gyp/generator/__pycache__
-%{py3_sitescriptdir}/gyp-%{version}-py*.egg-info
-%endif
-
 %if !%{with python3}
 %files -n python-%{name}
 %defattr(644,root,root,755)
@@ -151,3 +139,15 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitescriptdir}/gyp-%{version}-py*.egg-info
 %endif
 %endif
+
+%if %{with python3}
+%files -n python3-%{name}
+%defattr(644,root,root,755)
+%dir %{py3_sitescriptdir}/gyp
+%dir %{py3_sitescriptdir}/gyp/generator
+%{py3_sitescriptdir}/gyp/*.py
+%{py3_sitescriptdir}/gyp/__pycache__
+%{py3_sitescriptdir}/gyp/generator/*.py
+%{py3_sitescriptdir}/gyp/generator/__pycache__
+%{py3_sitescriptdir}/gyp-%{version}-py*.egg-info
+%endif


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gyp.git/commitdiff/368464aa8c4a0a09c43f2c7ba4e4be06606d2932

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/gyp] - typo

2022-04-02 Thread hawk

commit 8eebf2c20e88a6acbd2065a039b0e7e855e6f4bc
Author: Marcin Krol 
Date:   Sat Apr 2 10:30:20 2022 +

- typo

 gyp.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gyp.spec b/gyp.spec
index bf5a294..f2121d2 100644
--- a/gyp.spec
+++ b/gyp.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_withtests   # build without tests
-%bcond_withpython3 # build with python 2.x
+%bcond_withpython3 # build with python 3.x
 
 %definegitrev  e87d37d6
 %definerel 1


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gyp.git/commitdiff/8eebf2c20e88a6acbd2065a039b0e7e855e6f4bc

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/gyp] - allow building with python3, but still use python2 by default

2022-04-02 Thread hawk

commit c57342870a729fdfe800424099512601b3322459
Author: Marcin Krol 
Date:   Sat Apr 2 10:16:46 2022 +

- allow building with python3, but still use python2 by default

 gyp.spec | 54 ++
 1 file changed, 50 insertions(+), 4 deletions(-)
---
diff --git a/gyp.spec b/gyp.spec
index 0f008ff..bf5a294 100644
--- a/gyp.spec
+++ b/gyp.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
 %bcond_withtests   # build without tests
+%bcond_withpython3 # build with python 2.x
 
 %definegitrev  e87d37d6
 %definerel 1
@@ -22,10 +23,12 @@ Patch3: gyp-python38.patch
 Patch4: gyp-fix-cmake.patch
 Patch5: gyp-python39.patch
 URL:   https://gyp.gsrc.io/
-BuildRequires: python-devel
+%{!?with_python3:BuildRequires:python-devel}
+%{?with_python3:BuildRequires: python3-devel}
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
-Requires:  python-%{name} = %{version}-%{release}
+%{!?with_python3:Requires: python-%{name} = %{version}-%{release}}
+%{?with_python3:Requires:  python3-%{name} = %{version}-%{release}}
 BuildArch: noarch
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,6 +69,29 @@ poszczególnych platform, aby obsłużyć różnice między nimi.
 
 Ten pakiet zawiera moduły Pythona.
 
+%package -n python3-%{name}
+Summary:   Python modules for GYP
+Summary(pl.UTF-8): Moduły Pythona module dla GYP
+Group: Development/Languages/Python
+
+%description -n python3-%{name}
+GYP is a tool to generates native Visual Studio, Xcode and SCons
+and/or make build files from a platform-independent input format. It's
+syntax is a universal cross-platform build representation that still
+allows sufficient per-platform flexibility to accommodate
+poszczególnych platform, aby obsłużyć różnice między nimi.
+
+This package contains Python modules.
+
+%description -n python3-%{name} -l pl.UTF-8
+GYP to narzędzie generujące natywne pliki budowania dla Visual Studio,
+Xcode, SCons i/lub make'a z formatu wejściowego niezależnego od
+platformy. Składnia jest uniwersalną, wieloplatformową reprezentacją
+reguł, która nadal pozwala na wystarczającą elastyczność dla
+poszczególnych platform, aby obsłużyć różnice między nimi.
+
+Ten pakiet zawiera moduły Pythona.
+
 %prep
 %setup -q -c
 %patch0 -p1
@@ -76,16 +102,23 @@ Ten pakiet zawiera moduły Pythona.
 %patch5 -p1
 
 %build
+%if %{with python3}
+%py3_build
+%else
 %py_build
+%endif
 
 %{?with_tests:%{__python} gyptest.py -a}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with python3}
+%py3_install
+%else
 %py_install
-
 %py_postclean
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,13 +128,26 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS LICENSE
 %attr(755,root,root) %{_bindir}/gyp
 
+%if %{with python3}
+%files -n python3-%{name}
+%defattr(644,root,root,755)
+%dir %{py3_sitescriptdir}/gyp
+%dir %{py3_sitescriptdir}/gyp/generator
+%{py3_sitescriptdir}/gyp/*.py
+%{py3_sitescriptdir}/gyp/__pycache__
+%{py3_sitescriptdir}/gyp/generator/*.py
+%{py3_sitescriptdir}/gyp/generator/__pycache__
+%{py3_sitescriptdir}/gyp-%{version}-py*.egg-info
+%endif
+
+%if !%{with python3}
 %files -n python-%{name}
 %defattr(644,root,root,755)
 %dir %{py_sitescriptdir}/gyp
 %dir %{py_sitescriptdir}/gyp/generator
 %{py_sitescriptdir}/gyp/*.py[co]
 %{py_sitescriptdir}/gyp/generator/*.py[co]
-
 %if "%{py_ver}" > "2.4"
 %{py_sitescriptdir}/gyp-%{version}-py*.egg-info
 %endif
+%endif


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gyp.git/commitdiff/c57342870a729fdfe800424099512601b3322459

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/jsoncpp] - switch to python3

2022-03-01 Thread hawk

commit dac5b028501ca2f572b2077ec43a2c3c7569bd1b
Author: Marcin Krol 
Date:   Tue Mar 1 23:32:16 2022 +0100

- switch to python3

 jsoncpp.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/jsoncpp.spec b/jsoncpp.spec
index 55104ec..3f8f9be 100644
--- a/jsoncpp.spec
+++ b/jsoncpp.spec
@@ -7,7 +7,7 @@ Summary:API for manipulating JSON
 Summary(pl.UTF-8): API do operacji na strukturach JSON
 Name:  jsoncpp
 Version:   1.8.4
-Release:   1
+Release:   2
 License:   MIT or Public Domain
 Group: Libraries
 #Source0Download: https://github.com/open-source-parsers/jsoncpp/releases
@@ -16,7 +16,7 @@ Source0:  
https://github.com/open-source-parsers/jsoncpp/archive/%{version}/%{nam
 URL:   https://github.com/open-source-parsers/jsoncpp/
 BuildRequires: cmake >= 3.1
 BuildRequires: libstdc++-devel
-BuildRequires: python >= 2
+BuildRequires: python3
 %if %{with apidocs}
 BuildRequires: doxygen
 BuildRequires: graphviz
@@ -81,7 +81,7 @@ cd build
 cd ..
 
 %if %{with apidocs}
-%{__python} doxybuild.py \
+%{__python3} doxybuild.py \
--dot=/usr/bin/dot \
--doxygen=/usr/bin/doxygen
 %endif


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jsoncpp.git/commitdiff/dac5b028501ca2f572b2077ec43a2c3c7569bd1b

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/libedit] - rediffed

2022-03-01 Thread hawk

commit 41766472bf09a679b7f067af9480336b9fafbc50
Author: Marcin Krol 
Date:   Tue Mar 1 23:22:00 2022 +0100

- rediffed

 libedit-man.patch | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/libedit-man.patch b/libedit-man.patch
index 2b4f9f7..121bc3f 100644
--- a/libedit-man.patch
+++ b/libedit-man.patch
@@ -1,6 +1,7 @@
 libedit-20041207-2.9/doc/Makefile.am.orig  2004-11-06 10:16:18.0 
+0100
-+++ libedit-20041207-2.9/doc/Makefile.am   2005-03-10 22:38:31.942020328 
+0100
-@@ -12,7 +12,7 @@
+diff -urNp -x '*.orig' libedit-20191231-3.1.org/doc/Makefile.am 
libedit-20191231-3.1/doc/Makefile.am
+--- libedit-20191231-3.1.org/doc/Makefile.am   2018-05-25 19:50:45.0 
+0200
 libedit-20191231-3.1/doc/Makefile.am   2022-03-01 23:21:05.335645824 
+0100
+@@ -52,7 +52,7 @@ EL_MAN_LINKS += \
  install-data-hook: $(EL_MAN_LINKS)
  
  $(EL_MAN_LINKS):
@@ -8,4 +9,4 @@
 +  (cd $(DESTDIR)$(man3dir) && rm -f $@ && echo '.so editline.3' > $@)
  
  $(EL_MANS):
-   if test "$(MANTYPE)" = "mdoc"; then\
+   @if test "$(MANTYPE)" = "mdoc"; then\


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libedit.git/commitdiff/41766472bf09a679b7f067af9480336b9fafbc50

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/doxygen] - allow building without doc

2022-03-01 Thread hawk

commit 69b72b24cde5855cdfc256189a9db13fbd95182e
Author: Marcin Krol 
Date:   Tue Mar 1 20:19:12 2022 +0100

- allow building without doc

 doxygen.spec | 25 -
 1 file changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/doxygen.spec b/doxygen.spec
index f5f5479..92a85e1 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -1,6 +1,7 @@
 # NOTE: on upgrades, beware of texlive features available in PLD
 #
 # Conditional build:
+%bcond_without doc # without doc
 %bcond_without qt  # without doxywizard (qt-based)
 %bcond_without xapian  # without doxysearch (xapian based)
 #
@@ -34,11 +35,11 @@ BuildRequires:  ghostscript-fonts-std
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: perl-base
-BuildRequires: python >= 2
+BuildRequires: python3
 %{?with_qt:BuildRequires:  qt4-build >= 4.3}
 %{?with_qt:BuildRequires:  qt4-qmake >= 4.3}
-BuildRequires: texlive-latex
-BuildRequires: texlive-pdftex
+%{?with_doc:BuildRequires: texlive-latex}
+%{?with_doc:BuildRequires: texlive-pdftex}
 %{?with_xapian:BuildRequires:  xapian-core-devel}
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -189,13 +190,15 @@ install -d build
 cd build
 %cmake .. \
-DBUILD_SHARED_LIBS=OFF \
-   -Dbuild_doc=ON \
+   %{?with_doc:-Dbuild_doc=ON} \
%{?with_xapian:-Dbuild_search=ON} \
%{?with_qt:-Dbuild_wizard=ON}
 
 %{__make}
 
+%if %{with doc}
 %{__make} docs
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -206,12 +209,24 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}
 cp -pr examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+%if !%{with doc}
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -c -m 644 doc/doxygen.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%if %{with xapian}
+install -c -m 644 doc/doxyindexer.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -c -m 644 doc/doxysearch.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%endif
+%if %{with qt}
+%endif
+install -c -m 644 doc/doxywizard.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.md build/html
+%doc README.md %{?with_doc:build/html}
 %attr(755,root,root) %{_bindir}/doxygen
 %{_examplesdir}/%{name}-%{version}
 %{_mandir}/man1/doxygen.1*


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/doxygen.git/commitdiff/69b72b24cde5855cdfc256189a9db13fbd95182e

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: libpsl: ERRORS: libpsl-0.21.1.tar.lz publicsuffix_list-20150827.tar.gz

2022-03-01 Thread hawk

Request by: hawk

libpsl: undefined macro psl_ref



Files fetched: 0

ALREADY GOT: 
https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.lz
ebbc144e311a66cfdae503f48f21bf2d  libpsl-0.21.1.tar.lz
ALREADY GOT: 
https://github.com/publicsuffix/list/archive/1fc1ed365818a6a77d6f31d425ff03ca54cdc7f3/publicsuffix_list-20150827.tar.gz
ee9a591d4545d9f6ca350bd9df2c2e51  publicsuffix_list-20150827.tar.gz


-- 
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/libpsl] - typo

2022-03-01 Thread hawk

commit 867e88d150e6e2a74a240f08a050210a491728dc
Author: Marcin Krol 
Date:   Tue Mar 1 20:14:11 2022 +0100

- typo

 libpsl.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/libpsl.spec b/libpsl.spec
index a714725..44eb5d5 100644
--- a/libpsl.spec
+++ b/libpsl.spec
@@ -172,7 +172,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
DESTDIR=$RPM_BUILD_ROOT
 
-%if !%{with apidos}
+%if !%{with apidocs}
 install -d $RPM_BUILD_ROOT%{_mandir}/man3
 install -c -m 644 docs/libpsl/libpsl.3 $RPM_BUILD_ROOT%{_mandir}/man3
 %endif


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libpsl.git/commitdiff/867e88d150e6e2a74a240f08a050210a491728dc

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/rtmpdump] - rediffed

2022-02-26 Thread hawk

commit e71a5151b29ad0fb976bd75e7a82285daec6b893
Author: Marcin Krol 
Date:   Sun Feb 27 02:00:24 2022 +0100

- rediffed

 rtmpdump-libtool.patch | 26 ++
 1 file changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/rtmpdump-libtool.patch b/rtmpdump-libtool.patch
index db09d3a..9123047 100644
--- a/rtmpdump-libtool.patch
+++ b/rtmpdump-libtool.patch
@@ -1,6 +1,7 @@
 rtmpdump-2.3/Makefile.orig 2014-02-02 11:00:29.162772691 +0100
-+++ rtmpdump-2.3/Makefile  2014-02-02 11:02:29.859434291 +0100
-@@ -2,8 +2,10 @@
+diff -urNp -x '*.orig' rtmpdump-c5f04a5.org/Makefile rtmpdump-c5f04a5/Makefile
+--- rtmpdump-c5f04a5.org/Makefile  2019-03-30 22:33:00.0 +0100
 rtmpdump-c5f04a5/Makefile  2022-02-27 01:58:10.811841072 +0100
+@@ -2,8 +2,10 @@ VERSION=v2.4
  
  prefix=/usr/local
  
@@ -11,7 +12,7 @@
  
  SYS=posix
  #SYS=mingw
-@@ -43,7 +45,7 @@
+@@ -44,7 +46,7 @@ THREADLIB_mingw=
  THREADLIB=$(THREADLIB_$(SYS))
  SLIBS=$(THREADLIB) $(LIBS)
  
@@ -20,9 +21,9 @@
  INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h
  
  EXT_posix=
-@@ -59,11 +61,11 @@
+@@ -60,11 +62,11 @@ $(PROGS): $(LIBRTMP)
  
- install:  progs
+ install:  $(PROGS)
-mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
 -  cp rtmpdump$(EXT) $(BINDIR)
 -  cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
@@ -35,7 +36,7 @@
  
  clean:
rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
-@@ -74,17 +76,19 @@
+@@ -75,17 +77,19 @@ FORCE:
  $(LIBRTMP): FORCE
@cd librtmp; $(MAKE) all
  
@@ -59,9 +60,10 @@
  
  rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
  rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile
 rtmpdump-fa8646d/librtmp/Makefile.orig 2015-12-23 20:09:27.0 
+0100
-+++ rtmpdump-fa8646d/librtmp/Makefile  2018-04-14 19:42:42.380311763 +0200
-@@ -11,9 +11,11 @@
+diff -urNp -x '*.orig' rtmpdump-c5f04a5.org/librtmp/Makefile 
rtmpdump-c5f04a5/librtmp/Makefile
+--- rtmpdump-c5f04a5.org/librtmp/Makefile  2019-03-30 22:33:00.0 
+0100
 rtmpdump-c5f04a5/librtmp/Makefile  2022-02-27 01:58:10.811841072 +0100
+@@ -11,9 +11,11 @@ INCDIR=$(DESTDIR)$(incdir)
  LIBDIR=$(DESTDIR)$(libdir)
  MANDIR=$(DESTDIR)$(mandir)
  
@@ -73,7 +75,7 @@
  
  SYS=posix
  CRYPTO=OPENSSL
-@@ -78,25 +80,24 @@
+@@ -78,25 +80,24 @@ CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(
  LDFLAGS=$(XLDFLAGS)
  
  
@@ -112,7 +114,7 @@
  
  librtmp.pc: librtmp.pc.in Makefile
sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
-@@ -105,17 +106,10 @@
+@@ -105,17 +106,10 @@ librtmp.pc: librtmp.pc.in Makefile
-e "s;@PUBLIC_LIBS@;$(PUBLIC_LIBS);" \
-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
  


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rtmpdump.git/commitdiff/e71a5151b29ad0fb976bd75e7a82285daec6b893

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/p11-kit] - BR gtk-doc only with apidocs enabled

2022-02-26 Thread hawk

commit d3b17959bf3f451f71cf8e0f328e3e20274165ba
Author: Marcin Krol 
Date:   Sun Feb 27 01:19:41 2022 +0100

- BR gtk-doc only with apidocs enabled

 p11-kit.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/p11-kit.spec b/p11-kit.spec
index 8a0fc29..e96a86e 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -15,7 +15,7 @@ Source0:  
https://github.com/p11-glue/p11-kit/releases/download/%{version}/%{name
 # Source0-md5: 03f93a4eb62127b5d40e345c624a0665
 URL:   https://p11-glue.github.io/p11-glue/p11-kit.html
 BuildRequires: gettext-tools >= 0.19.8
-BuildRequires: gtk-doc >= 1.15
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.15}
 BuildRequires: libffi-devel >= 3.0.0
 BuildRequires: libtasn1-devel >= 2.14
 BuildRequires: pkgconfig >= 1:0.29


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/p11-kit.git/commitdiff/d3b17959bf3f451f71cf8e0f328e3e20274165ba

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/cracklib] - cleanup

2022-02-26 Thread hawk

commit 36c4d09f061e3e5932f28030ad95ab5220bf49ea
Author: Marcin Krol 
Date:   Sat Feb 26 23:46:28 2022 +

- cleanup

 cracklib-python3.patch | 7 ---
 1 file changed, 7 deletions(-)
---
diff --git a/cracklib-python3.patch b/cracklib-python3.patch
index 7c7a08d..714f1fa 100644
--- a/cracklib-python3.patch
+++ b/cracklib-python3.patch
@@ -10,10 +10,3 @@ diff -u cracklib-2.9.7.orig/configure.ac 
cracklib-2.9.7/configure.ac
[if test "$build_python" != yes ; then
AC_MSG_WARN([python was not found, continuing])
build_python=no
-Common subdirectories: cracklib-2.9.7.orig/dicts and cracklib-2.9.7/dicts
-Common subdirectories: cracklib-2.9.7.orig/doc and cracklib-2.9.7/doc
-Common subdirectories: cracklib-2.9.7.orig/lib and cracklib-2.9.7/lib
-Common subdirectories: cracklib-2.9.7.orig/m4 and cracklib-2.9.7/m4
-Common subdirectories: cracklib-2.9.7.orig/po and cracklib-2.9.7/po
-Common subdirectories: cracklib-2.9.7.orig/python and cracklib-2.9.7/python
-Common subdirectories: cracklib-2.9.7.orig/util and cracklib-2.9.7/util


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cracklib.git/commitdiff/36c4d09f061e3e5932f28030ad95ab5220bf49ea

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/cracklib] - only python 2 or 3 stuff can be built, not both, prefer python 3

2022-02-26 Thread hawk

commit 3c736fab931dca346ef39a23c9dfd1431d43a1da
Author: Marcin Krol 
Date:   Sat Feb 26 23:43:10 2022 +

- only python 2 or 3 stuff can be built, not both, prefer python 3

 cracklib-python3.patch | 19 +++
 cracklib.spec  | 20 +++-
 2 files changed, 34 insertions(+), 5 deletions(-)
---
diff --git a/cracklib.spec b/cracklib.spec
index 17f0217..3808876 100644
--- a/cracklib.spec
+++ b/cracklib.spec
@@ -1,6 +1,10 @@
-%bcond_without python2 # Don't build python 2 bindings
+%bcond_withpython2 # Don't build python 2 bindings
 %bcond_without python3 # Don't build python 3 bindings
 
+%if %{with python3}
+%undefine with_python2
+%endif
+
 Summary:   Password checking library
 Summary(es.UTF-8): Biblioteca de chequeo de contraseñas
 Summary(fr.UTF-8): Bibliothèque de vérification de mots de passe
@@ -20,6 +24,7 @@ Source0:  
https://github.com/cracklib/cracklib/releases/download/v%{version}/%{na
 # for manuals (note: update when available)
 Source1:   
http://ftp.debian.org/debian/pool/main/c/cracklib2/%{name}2_2.9.6-2.debian.tar.xz
 # Source1-md5: 6af239dbba1fa8ce3ecc0724babe5078
+Patch0:%{name}-python3.patch
 URL:   https://github.com/cracklib/cracklib
 BuildRequires: gettext-tools >= 0.17
 %{?with_python2:BuildRequires: python-devel}
@@ -178,8 +183,13 @@ Wiązanie Pythona do crackliba.
 
 %prep
 %setup -q -a1
+%{?with_python3:%patch0 -p1}
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
--with-default-dict=%{_datadir}/dict/cracklib_dict
 %{__make}
@@ -210,8 +220,8 @@ util/cracklib-packer 
$RPM_BUILD_ROOT%{_datadir}/dict/cracklib-small
 
 %if %{with python3}
 %{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/*.{la,a}
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/test_cracklib.py*
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/__pycache__/test_cracklib.*.py*
+%{__rm} $RPM_BUILD_ROOT%{py3_sitescriptdir}/test_cracklib.py*
+%{__rm} $RPM_BUILD_ROOT%{py3_sitescriptdir}/__pycache__/test_cracklib.*.py*
 %endif
 
 # already in file(1) database
@@ -260,6 +270,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python3-cracklib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py3_sitedir}/_cracklib.so
-%{py3_sitedir}/cracklib.py
-%{py3_sitedir}/__pycache__/cracklib.*.py[co]
+%{py3_sitescriptdir}/cracklib.py
+%{py3_sitescriptdir}/__pycache__/cracklib.*.py[co]
 %endif
diff --git a/cracklib-python3.patch b/cracklib-python3.patch
new file mode 100644
index 000..7c7a08d
--- /dev/null
+++ b/cracklib-python3.patch
@@ -0,0 +1,19 @@
+diff -u cracklib-2.9.7.orig/configure.ac cracklib-2.9.7/configure.ac
+--- cracklib-2.9.7.orig/configure.ac   2019-03-03 17:49:19.0 +
 cracklib-2.9.7/configure.ac2022-02-26 23:30:53.361504964 +
+@@ -72,7 +72,7 @@
+ AC_HELP_STRING(--without-python,[Build a python module @<:@default=auto@:>@]),
+ build_python=$withval,build_python=auto)
+ if test "$build_python" != no ; then
+-   AM_PATH_PYTHON(,,
++   AM_PATH_PYTHON([3],,
+   [if test "$build_python" != yes ; then
+   AC_MSG_WARN([python was not found, continuing])
+   build_python=no
+Common subdirectories: cracklib-2.9.7.orig/dicts and cracklib-2.9.7/dicts
+Common subdirectories: cracklib-2.9.7.orig/doc and cracklib-2.9.7/doc
+Common subdirectories: cracklib-2.9.7.orig/lib and cracklib-2.9.7/lib
+Common subdirectories: cracklib-2.9.7.orig/m4 and cracklib-2.9.7/m4
+Common subdirectories: cracklib-2.9.7.orig/po and cracklib-2.9.7/po
+Common subdirectories: cracklib-2.9.7.orig/python and cracklib-2.9.7/python
+Common subdirectories: cracklib-2.9.7.orig/util and cracklib-2.9.7/util


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cracklib.git/commitdiff/3c736fab931dca346ef39a23c9dfd1431d43a1da

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/cracklib] - added python3 subpackage, added python2/3 bconds, release 2

2022-02-26 Thread hawk

commit dc66f3d0f5a5c1b93baabae9a4fd3da23191b348
Author: Marcin Krol 
Date:   Sun Feb 27 00:07:15 2022 +0100

- added python3 subpackage, added python2/3 bconds, release 2

 cracklib.spec | 42 +++---
 1 file changed, 39 insertions(+), 3 deletions(-)
---
diff --git a/cracklib.spec b/cracklib.spec
index 04e442f..17f0217 100644
--- a/cracklib.spec
+++ b/cracklib.spec
@@ -1,3 +1,6 @@
+%bcond_without python2 # Don't build python 2 bindings
+%bcond_without python3 # Don't build python 3 bindings
+
 Summary:   Password checking library
 Summary(es.UTF-8): Biblioteca de chequeo de contraseñas
 Summary(fr.UTF-8): Bibliothèque de vérification de mots de passe
@@ -8,7 +11,7 @@ Summary(tr.UTF-8): Parola denetim kitaplığı
 Summary(uk.UTF-8): Бібліотека перевірки паролів
 Name:  cracklib
 Version:   2.9.7
-Release:   1
+Release:   2
 License:   LGPL v2.1+
 Group: Libraries
 #Source0Download: https://github.com/cracklib/cracklib/releases
@@ -19,8 +22,10 @@ Source1: 
http://ftp.debian.org/debian/pool/main/c/cracklib2/%{name}2_2.9.6-2.deb
 # Source1-md5: 6af239dbba1fa8ce3ecc0724babe5078
 URL:   https://github.com/cracklib/cracklib
 BuildRequires: gettext-tools >= 0.17
-BuildRequires: python-devel
-BuildRequires: python-modules
+%{?with_python2:BuildRequires: python-devel}
+%{?with_python2:BuildRequires: python-modules}
+%{?with_python3:BuildRequires: python3-devel}
+%{?with_python3:BuildRequires: python3-modules}
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
 BuildRequires: tar >= 1:1.22
@@ -158,6 +163,19 @@ Python binding for cracklib.
 %description -n python-cracklib -l pl.UTF-8
 Wiązanie Pythona do crackliba.
 
+%package -n python3-cracklib
+Summary:   Python binding for cracklib
+Summary(pl.UTF-8): Wiązanie Pythona do crackliba
+Group: Libraries/Python
+Requires:  %{name} = %{version}-%{release}
+%pyrequires_eq python-libs
+
+%description -n python3-cracklib
+Python binding for cracklib.
+
+%description -n python3-cracklib -l pl.UTF-8
+Wiązanie Pythona do crackliba.
+
 %prep
 %setup -q -a1
 
@@ -184,9 +202,17 @@ util/cracklib-format 
$RPM_BUILD_ROOT%{_datadir}/%{name}/cracklib-small | \
 util/cracklib-packer $RPM_BUILD_ROOT%{_datadir}/dict/cracklib-small
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/cracklib-small
 
+%if %{with python2}
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
 %{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/test_cracklib.py*
 %py_postclean
+%endif
+
+%if %{with python3}
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/test_cracklib.py*
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/__pycache__/test_cracklib.*.py*
+%endif
 
 # already in file(1) database
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/cracklib.magic
@@ -223,7 +249,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libcrack.a
 
+%if %{with python2}
 %files -n python-cracklib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_cracklib.so
 %{py_sitescriptdir}/cracklib.py[co]
+%endif
+
+%if %{with python3}
+%files -n python3-cracklib
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py3_sitedir}/_cracklib.so
+%{py3_sitedir}/cracklib.py
+%{py3_sitedir}/__pycache__/cracklib.*.py[co]
+%endif


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cracklib.git/commitdiff/dc66f3d0f5a5c1b93baabae9a4fd3da23191b348

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/nghttp2] - allow building without systemd support

2022-02-26 Thread hawk

commit a8f9a0f95e22ea2300cd4b4ff5c19df93fdac87c
Author: Marcin Krol 
Date:   Sat Feb 26 20:12:07 2022 +0100

- allow building without systemd support

 nghttp2.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/nghttp2.spec b/nghttp2.spec
index 5cf9102..db24b2a 100644
--- a/nghttp2.spec
+++ b/nghttp2.spec
@@ -5,6 +5,7 @@
 %bcond_withhttp3   # experimental HTTP/3 support
 %bcond_withlibbpf  # BPF support (requires CC=clang)
 %bcond_without static_libs # static libraries
+%bcond_without systemd # don't include systemd support
 %bcond_without tests   # "make check" call
 
 Summary:   HTTP/2.0 C library
@@ -45,7 +46,7 @@ BuildRequires:python3-setuptools
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.734
 BuildRequires: sed >= 4.0
-BuildRequires: systemd-devel >= 1:209
+%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRequires: zlib-devel >= 1.2.3


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nghttp2.git/commitdiff/a8f9a0f95e22ea2300cd4b4ff5c19df93fdac87c

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: python3-numpy: numpy-1.22.2.tar.gz

2022-02-26 Thread hawk

Request by: hawk


Files fetched: 1

STORED: 
https://github.com/numpy/numpy/releases/download/v1.22.2/numpy-1.22.2.tar.gz
5b506b01ef454f39272ca75de1c7f61c  numpy-1.22.2.tar.gz
Size: 10523600 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/python3-numpy] - updated to 1.22.2, R python3-devel, not python-devel

2022-02-26 Thread hawk

commit 98e4d49dd1761c7aac5f7b9e7b39edc7eb9ba702
Author: Marcin Krol 
Date:   Sat Feb 26 17:08:47 2022 +0100

- updated to 1.22.2, R python3-devel, not python-devel

 python3-numpy.spec | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/python3-numpy.spec b/python3-numpy.spec
index 42dc45c..592f39d 100644
--- a/python3-numpy.spec
+++ b/python3-numpy.spec
@@ -6,15 +6,14 @@
 Summary:   Python 3.x numerical facilities
 Summary(pl.UTF-8): Moduły do obliczeń numerycznych dla języka Python 3.x
 Name:  python3-%{module}
-Version:   1.21.4
+Version:   1.22.2
 Release:   1
 Epoch: 1
 License:   BSD
 Group: Libraries/Python
 #Source0Download: https://github.com/numpy/numpy/releases/
 Source0:   
https://github.com/numpy/numpy/releases/download/v%{version}/%{module}-%{version}.tar.gz
-# Source0-md5: 06019c1116b3e2791bd507f898257e7f
-Patch0:bpo-45167.patch
+# Source0-md5: 5b506b01ef454f39272ca75de1c7f61c
 URL:   https://github.com/numpy/numpy
 BuildRequires: gcc-fortran
 BuildRequires: lapack-devel >= 3.1.1-2
@@ -45,7 +44,7 @@ Ten pakiet zawiera moduły Pythona 3.
 Summary:   C header files for Python 3 numerical modules
 Summary(pl.UTF-8): Pliki nagłówkowe języka C modułów numerycznych Pythona 3
 Group: Development/Languages/Python
-%pyrequires_eq python-devel
+%pyrequires_eq python3-devel
 Requires:  %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
@@ -68,7 +67,6 @@ Generator interfejsów z Fortranu do Pythona 3.
 
 %prep
 %setup -q -n %{module}-%{version}
-%patch0 -p1
 
 %build
 # numpy.distutils uses CFLAGS/LDFLAGS as its own flags replacements,
@@ -106,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %{py3_sitedir}/%{module}/*.pyi
 %{py3_sitedir}/%{module}/py.typed
 %{py3_sitedir}/%{module}/__pycache__
+%dir %{py3_sitedir}/%{module}/array_api
+%{py3_sitedir}/%{module}/array_api/*.py
+%{py3_sitedir}/%{module}/array_api/__pycache__
 %dir %{py3_sitedir}/%{module}/compat
 %{py3_sitedir}/%{module}/compat/*.py
 %{py3_sitedir}/%{module}/compat/__pycache__


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python3-numpy.git/commitdiff/98e4d49dd1761c7aac5f7b9e7b39edc7eb9ba702

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/guile] - rediffed, release 5

2022-02-25 Thread hawk

commit 4c981d2d3e8aaf7c4ca9b8e3939b7078b73cd0d1
Author: Marcin Krol 
Date:   Sat Feb 26 00:51:25 2022 +0100

- rediffed, release 5

 guile-fix_awk_patch.patch |  9 +
 guile-info.patch  | 28 +++-
 guile.spec|  2 +-
 3 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/guile.spec b/guile.spec
index 9426f81..b77bee8 100644
--- a/guile.spec
+++ b/guile.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8):Язык расширений GNU
 Summary(uk.UTF-8): Мова розширень GNU
 Name:  guile
 Version:   2.2.7
-Release:   4
+Release:   5
 Epoch: 5
 License:   LGPL v3+
 Group: Development/Languages
diff --git a/guile-fix_awk_patch.patch b/guile-fix_awk_patch.patch
index dcc489c..f279d0c 100644
--- a/guile-fix_awk_patch.patch
+++ b/guile-fix_awk_patch.patch
@@ -1,8 +1,9 @@
 guile-2.0.0.orig/libguile/guile-func-name-checkSat Aug 26 19:19:07 2000
-+++ guile-2.0.0/libguile/guile-func-name-check Tue Jan 11 22:47:57 2000
+diff -urNp -x '*.orig' guile-2.2.7.org/libguile/guile-func-name-check 
guile-2.2.7/libguile/guile-func-name-check
+--- guile-2.2.7.org/libguile/guile-func-name-check 2017-04-20 
19:02:45.0 +0200
 guile-2.2.7/libguile/guile-func-name-check 2022-02-26 00:01:59.308490795 
+0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/awk -f
 +#!/bin/awk -f
  #
- #  Copyright (C) 2000, 2001 Free Software Foundation, Inc.
- #
+ #  Copyright (C) 2000, 2001, 2006, 2017 Free Software Foundation, Inc.
+ # 
diff --git a/guile-info.patch b/guile-info.patch
index 90782c2..6ddb273 100644
--- a/guile-info.patch
+++ b/guile-info.patch
@@ -1,16 +1,6 @@
 guile-1.6.1/doc/ref/guile.texi.origSun May  5 13:31:59 2002
-+++ guile-1.6.1/doc/ref/guile.texi Tue May 21 22:21:17 2002
-@@ -26,7 +26,7 @@
- 
- @dircategory The Algorithmic Language Scheme
- @direntry
--* Guile Reference: (guile). The Guile reference manual.
-+* Guile Reference: (guile).   The Guile reference manual
- @end direntry
- 
- @setchapternewpage off
 guile-1.6.1/doc/r5rs/r5rs.texi.origSat Dec  7 23:41:29 2002
-+++ guile-1.6.1/doc/r5rs/r5rs.texi Tue Dec 24 23:34:38 2002
+diff -urNp -x '*.orig' guile-2.2.7.org/doc/r5rs/r5rs.texi 
guile-2.2.7/doc/r5rs/r5rs.texi
+--- guile-2.2.7.org/doc/r5rs/r5rs.texi 2013-05-21 22:40:16.0 +0200
 guile-2.2.7/doc/r5rs/r5rs.texi 2022-02-26 00:01:27.496422199 +0100
 @@ -66,7 +66,7 @@
  @ifinfo
  @dircategory The Algorithmic Language Scheme
@@ -20,3 +10,15 @@
  @end direntry
  @end ifinfo
  
+diff -urNp -x '*.orig' guile-2.2.7.org/doc/ref/guile.texi 
guile-2.2.7/doc/ref/guile.texi
+--- guile-2.2.7.org/doc/ref/guile.texi 2019-06-04 21:24:01.0 +0200
 guile-2.2.7/doc/ref/guile.texi 2022-02-26 00:01:27.495422197 +0100
+@@ -127,7 +127,7 @@ x
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry
+-* Guile Reference: (guile). The Guile reference manual.
++* Guile Reference: (guile).   The Guile reference manual
+ @end direntry
+ 
+ @setchapternewpage odd


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/guile.git/commitdiff/4c981d2d3e8aaf7c4ca9b8e3939b7078b73cd0d1

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: libpsl: ERRORS: libpsl-0.21.1.tar.lz publicsuffix_list-20150827.tar.gz

2022-02-25 Thread hawk

Request by: hawk

libpsl: undefined macro psl_ref



Files fetched: 0

ALREADY GOT: 
https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.lz
ebbc144e311a66cfdae503f48f21bf2d  libpsl-0.21.1.tar.lz
ALREADY GOT: 
https://github.com/publicsuffix/list/archive/1fc1ed365818a6a77d6f31d425ff03ca54cdc7f3/publicsuffix_list-20150827.tar.gz
ee9a591d4545d9f6ca350bd9df2c2e51  publicsuffix_list-20150827.tar.gz


-- 
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/libpsl] - allow building without apidocs - builds fine w/o python, drop BR

2022-02-25 Thread hawk

commit 3ad5f476f5d8431da39cd4726f8f9b56f38a7313
Author: Marcin Krol 
Date:   Fri Feb 25 23:29:48 2022 +0100

- allow building without apidocs
- builds fine w/o python, drop BR

 libpsl.spec | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/libpsl.spec b/libpsl.spec
index 34d89d1..a714725 100644
--- a/libpsl.spec
+++ b/libpsl.spec
@@ -1,5 +1,6 @@
 #
 # Conditional build:
+%bcond_without apidocs # don't build api docs
 %bcond_without static_libs # static library
 %bcond_withicu # use ICU instead of libidn2+libunistring for 
IDNA2008
 
@@ -7,7 +8,7 @@ Summary:C library for the Publix Suffix List
 Summary(pl.UTF-8): Biblioteka C do obsługi listy przyrostków publicznych 
(Public Suffix List)
 Name:  libpsl
 Version:   0.21.1
-Release:   1
+Release:   2
 License:   MIT
 Group: Networking
 #Source0Download: https://github.com/rockdaboot/libpsl/releases
@@ -25,13 +26,12 @@ BuildRequires:  autoconf >= 2.59
 BuildRequires: automake >= 1:1.10
 BuildRequires: gettext-tools >= 0.18.1
 BuildRequires: glib2-devel
-BuildRequires: gtk-doc >= 1.15
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.15}
 %{?with_icu:BuildRequires: libicu-devel}
 %{!?with_icu:BuildRequires:libidn2-devel}
 BuildRequires: libtool >= 2:2
 BuildRequires: libxslt-progs
 BuildRequires: pkgconfig
-BuildRequires: python >= 1:2.7
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
@@ -148,7 +148,7 @@ rmdir list
 
 %build
 %{__gettextize}
-%{__gtkdocize}
+%{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -157,7 +157,7 @@ rmdir list
 %configure \
--disable-silent-rules \
%{!?with_static_libs:--disable-static} \
-   --enable-gtk-doc \
+   %{?with_apidocs:--enable-gtk-doc} \
--enable-man \
--enable-builtin=%{?with_icu:libicu}%{!?with_icu:libidn2} \
--enable-runtime=%{?with_icu:libicu}%{!?with_icu:libidn2} \
@@ -172,6 +172,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
DESTDIR=$RPM_BUILD_ROOT
 
+%if !%{with apidos}
+install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install -c -m 644 docs/libpsl/libpsl.3 $RPM_BUILD_ROOT%{_mandir}/man3
+%endif
+
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libpsl.la
 # tool not installed
@@ -202,9 +207,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpsl.a
 %endif
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libpsl
+%endif
 
 %files utils
 %defattr(644,root,root,755)


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libpsl.git/commitdiff/3ad5f476f5d8431da39cd4726f8f9b56f38a7313

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/libnl] - allow building without python netlink

2022-02-25 Thread hawk

commit 572066c7b519418dd6ae01d5250d1946ba25774b
Author: Marcin Krol 
Date:   Fri Feb 25 23:28:16 2022 +0100

- allow building without python netlink

 libnl.spec | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/libnl.spec b/libnl.spec
index f0a5517..7b1ebea 100644
--- a/libnl.spec
+++ b/libnl.spec
@@ -1,13 +1,14 @@
 #
 # Conditional build:
 %bcond_without apidocs # don't build api docs
+%bcond_without python  # don't build python netlink
 %bcond_without tests   # don't perform "make check"
 
 Summary:   Netlink sockets library
 Summary(pl.UTF-8): Biblioteka do obsługi gniazd netlink
 Name:  libnl
 Version:   3.5.0
-Release:   1
+Release:   2
 Epoch: 1
 License:   LGPL v2.1
 Group: Libraries
@@ -24,7 +25,7 @@ BuildRequires:flex >= 2.5.34
 BuildRequires: libtool
 BuildRequires: linux-libc-headers >= 6:2.6.23
 BuildRequires: pkgconfig
-BuildRequires: python-devel >= 1:2.6
+%{?with_python:BuildRequires:  python-devel >= 1:2.6}
 BuildRequires: rpmbuild(macros) >= 1.219
 BuildRequires: swig-python
 %if 0 && %{with apidocs}
@@ -123,11 +124,13 @@ mv -f libnl-doc-%{version} doc
 %{?with_apidocs:%{__make} -j1 -C doc gendoc}
 %endif
 
+%if %{with python}
 cd python
 CFLAGS="%{rpmcflags}"
 LDFLAGS="%{rpmldflags} -L$(pwd)/../lib/.libs"
 %py_build
 cd ..
+%endif
 
 %{?with_tests:%{__make} check}
 
@@ -137,9 +140,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with python}
 cd python
 %py_install
 %py_postclean
+%endif
 
 # dynamic modules
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libnl/cli/*/*.{la,a}
@@ -245,6 +250,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/{*.html,libnl.css,api,images,stylesheets}
 %endif
 
+%if %{with python}
 %files -n python-netlink
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/netlink
@@ -261,3 +267,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/netlink/route/qdisc
 %{py_sitedir}/netlink/route/qdisc/*.py[co]
 %{py_sitedir}/netlink-1.0-py*.egg-info
+%endif


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libnl.git/commitdiff/572066c7b519418dd6ae01d5250d1946ba25774b

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/libpfm] - added build fix, release 4 rtop.c:373:40: error: format '%ld' expects argument of type 'long int

2022-02-22 Thread hawk

commit d5dd55c943b4b4f27dde243f42ab39705843a432
Author: Marcin Krol 
Date:   Tue Feb 22 18:58:56 2022 +0100

- added build fix, release 4
  rtop.c:373:40: error: format '%ld' expects argument of type 'long int', 
but argument 2 has type 'int' [-Werror=format=]

 libpfm-build.patch | 12 
 libpfm.spec|  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/libpfm.spec b/libpfm.spec
index 0c564d3..5489624 100644
--- a/libpfm.spec
+++ b/libpfm.spec
@@ -12,11 +12,12 @@ Summary:Library to encode performance events for use by 
perf tool
 Summary(pl.UTF-8): Biblioteka do kodowania zdarzeń związanych z 
wydajnością do użycia przez narzędzie perf
 Name:  libpfm
 Version:   4.11.0
-Release:   3
+Release:   4
 License:   MIT
 Group: Libraries
 Source0:   
http://downloads.sourceforge.net/perfmon2/%{name}-%{version}.tar.gz
 # Source0-md5: 4811c1d99b95752b4ba53b89a9389ec3
+Patch0:%{name}-build.patch
 URL:   http://perfmon2.sourceforge.net/
 %{?with_python2:BuildRequires: python-devel >= 2}
 %{?with_python3:BuildRequires: python3-devel >= 1:3.2}
@@ -85,6 +86,7 @@ Wiązania Pythona 3 do libpfm i wywołania systemowego 
perf_event_open.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__make} \
diff --git a/libpfm-build.patch b/libpfm-build.patch
new file mode 100644
index 000..f958fad
--- /dev/null
+++ b/libpfm-build.patch
@@ -0,0 +1,12 @@
+diff -ur libpfm-4.11.0.orig/perf_examples/rtop.c 
libpfm-4.11.0/perf_examples/rtop.c
+--- libpfm-4.11.0.orig/perf_examples/rtop.c2020-09-02 20:48:00.0 
+0200
 libpfm-4.11.0/perf_examples/rtop.c 2022-02-22 12:19:18.132785190 +0100
+@@ -371,7 +371,7 @@
+   if (u_cycles > 100.0) u_cycles = 100.0;
+ 
+   printw("CPU%-2ld %6.2f%% usr %6.2f%% sys %6.2f%% idle 
(scaling ratio %.2f%%)\n",
+-  i,
++  (long)i,
+   u_cycles,
+   k_cycles,
+   i_cycles,


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libpfm.git/commitdiff/d5dd55c943b4b4f27dde243f42ab39705843a432

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/perl-Module-Build] - rediffed

2022-02-20 Thread hawk

commit eae9db14ad578e35b4f210b7ceb9e92472a5094b
Author: Marcin Krol 
Date:   Mon Feb 21 00:18:11 2022 +0100

- rediffed

 perl-Module-Build-startperl.patch | 51 +--
 perl-Module-Build.spec|  2 +-
 2 files changed, 28 insertions(+), 25 deletions(-)
---
diff --git a/perl-Module-Build.spec b/perl-Module-Build.spec
index c5e4a3f..1b3d32d 100644
--- a/perl-Module-Build.spec
+++ b/perl-Module-Build.spec
@@ -8,7 +8,7 @@ Summary:Module::Build - build and install Perl modules
 Summary(pl.UTF-8): Module::Build - budowanie i instalowanie modułów Perla
 Name:  perl-Module-Build
 Version:   0.4231
-Release:   1
+Release:   2
 Epoch: 2
 # same as perl
 License:   GPL v1+ or Artistic
diff --git a/perl-Module-Build-startperl.patch 
b/perl-Module-Build-startperl.patch
index 106b37c..7c524e9 100644
--- a/perl-Module-Build-startperl.patch
+++ b/perl-Module-Build-startperl.patch
@@ -1,15 +1,28 @@
 Module-Build-0.2806/lib/Module/Build/Platform/Unix.pm  2004-04-26 
00:16:14.0 +0200
-+++ Module-Build-0.2806/lib/Module/Build/Platform/Unix.pm  2004-05-12 
00:17:10.059693704 +0200
-@@ -2,6 +2,7 @@
+diff -urNp -x '*.orig' Module-Build-0.4231.org/lib/Module/Build/Base.pm 
Module-Build-0.4231/lib/Module/Build/Base.pm
+--- Module-Build-0.4231.org/lib/Module/Build/Base.pm   2020-01-29 
08:51:23.0 +0100
 Module-Build-0.4231/lib/Module/Build/Base.pm   2022-02-21 
00:14:52.613086898 +0100
+@@ -2978,7 +2978,7 @@ sub process_script_files {
  
- use strict;
+   foreach my $file (sort keys %$files) {
+ my $result = $self->copy_if_modified($file, $script_dir, 'flatten') or 
next;
+-$self->fix_shebang_line($result) unless $self->is_vmsish;
++#   $self->fix_shebang_line($result) unless $self->is_vmsish;
+ $self->make_executable($result);
+   }
+ }
+diff -urNp -x '*.orig' 
Module-Build-0.4231.org/lib/Module/Build/Platform/Unix.pm 
Module-Build-0.4231/lib/Module/Build/Platform/Unix.pm
+--- Module-Build-0.4231.org/lib/Module/Build/Platform/Unix.pm  2020-01-29 
08:51:23.0 +0100
 Module-Build-0.4231/lib/Module/Build/Platform/Unix.pm  2022-02-21 
00:14:52.612086896 +0100
+@@ -5,6 +5,7 @@ use warnings;
+ our $VERSION = '0.4231';
+ $VERSION = eval $VERSION;
  use Module::Build::Base;
 +use Config;
  
- use vars qw(@ISA);
- @ISA = qw(Module::Build::Base);
-@@ -33,7 +34,11 @@
-   $self->SUPER::make_tarball(@_);
+ our @ISA = qw(Module::Build::Base);
+ 
+@@ -19,7 +20,11 @@ sub is_executable {
+   return +(stat $file)[2] & 0100;
  }
  
 -sub _startperl { "#! " . shift()->perl }
@@ -21,25 +34,15 @@
  
  sub _construct {
my $self = shift()->SUPER::_construct(@_);
 Module-Build-0.2806/t/runthrough.t.orig2006-12-22 12:29:34.390623866 
+0100
-+++ Module-Build-0.2806/t/runthrough.t 2006-12-22 12:26:36.836505633 +0100
-@@ -29,7 +29,7 @@
- $build->create_build_script;
+diff -urNp -x '*.orig' Module-Build-0.4231.org/t/runthrough.t 
Module-Build-0.4231/t/runthrough.t
+--- Module-Build-0.4231.org/t/runthrough.t 2020-01-29 08:51:23.0 
+0100
 Module-Build-0.4231/t/runthrough.t 2022-02-21 00:14:52.612086896 +0100
+@@ -25,7 +25,7 @@ $dist->add_file( 'MANIFEST.SKIP', <<'---
+ ^MYMETA.yml$
  ---
  $dist->add_file( 'script', <<'---' );
 -#!perl -w
 +#!/usr/bin/perl -w
  print "Hello, World!\n";
  ---
- $dist->add_file( 'test.pl', <<'---' );
 Module-Build-0.2808/lib/Module/Build/Base.pm.orig  2007-04-28 
19:50:55.0 +0200
-+++ Module-Build-0.2808/lib/Module/Build/Base.pm   2007-04-30 
13:28:03.047975140 +0200
-@@ -2292,7 +2292,7 @@
-   
-   foreach my $file (keys %$files) {
- my $result = $self->copy_if_modified($file, $script_dir, 'flatten') or 
next;
--$self->fix_shebang_line($result) unless $self->is_vmsish;
-+#   $self->fix_shebang_line($result) unless $self->is_vmsish;
- $self->make_executable($result);
-   }
- }
+ $dist->add_file( 'lib/Simple/Script.PL', <<'---' );


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/perl-Module-Build.git/commitdiff/eae9db14ad578e35b4f210b7ceb9e92472a5094b

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: chrony: chrony-4.2.tar.gz

2022-01-22 Thread hawk

Request by: hawk


Files fetched: 1

STORED: http://download.tuxfamily.org/chrony/chrony-4.2.tar.gz
07282f8e76a4399d6c17009bb6345614  chrony-4.2.tar.gz
Size: 578411 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/chrony] - updated to 4.2

2022-01-22 Thread hawk

commit c89c5fec02a8067b1e6307d133e4380acf912d3a
Author: Marcin Krol 
Date:   Sat Jan 22 12:37:36 2022 +0100

- updated to 4.2

 chrony.spec | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/chrony.spec b/chrony.spec
index f264f7e..c16bf89 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -4,20 +4,19 @@
 Summary:   An NTP client/server
 Summary(pl.UTF-8): Klient/serwer NTP
 Name:  chrony
-Version:   4.1
-Release:   2
+Version:   4.2
+Release:   1
 License:   GPL v2
 Group: Daemons
 Source0:   http://download.tuxfamily.org/chrony/%{name}-%{version}.tar.gz
-# Source0-md5: 7133880806887b629678c36a48217806
+# Source0-md5: 07282f8e76a4399d6c17009bb6345614
 Source1:   %{name}.conf
 Source2:   %{name}.keys
 Source3:   %{name}d.sysconfig
 Source4:   %{name}d.init
 Source5:   %{name}.logrotate
 Patch0:fix-seccomp-build.patch
-Patch1:chrony-seccomp.patch
-Patch2:conf.d.patch
+Patch1:conf.d.patch
 URL:   http://chrony.tuxfamily.org/
 BuildRequires: asciidoc
 BuildRequires: bison
@@ -65,7 +64,6 @@ Internetu, obsługuje także komputery na stałym łączu.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 # NOTE: It is not autoconf generated configre


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chrony.git/commitdiff/c89c5fec02a8067b1e6307d133e4380acf912d3a

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/awstats] - drop java dependency, code is run by browsers, drop java source too

2021-11-24 Thread hawk

commit 02ef1aefbf470c0c1376abfe8a1c424696c79be6
Author: Marcin Krol 
Date:   Wed Nov 24 18:09:17 2021 +0100

- drop java dependency, code is run by browsers, drop java source too

 awstats.spec | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/awstats.spec b/awstats.spec
index 4ede0d6..e54f2d6 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -8,7 +8,7 @@ Summary:Advanced Web Statistics is a free powerful 
server log file analyzer
 Summary(pl.UTF-8): Zaawansowany program do analizowania logów serwera
 Name:  awstats
 Version:   7.8
-Release:   1
+Release:   2
 License:   GPL v3+
 Group: Applications/Networking
 Source0:   http://awstats.sourceforge.net/files/%{name}-%{version}.tar.gz
@@ -33,6 +33,9 @@ Conflicts:apache-base < 2.4.0-1
 BuildArch: noarch
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# java code is run on clients browser
+%define_noautoreqfiles %{_datadir}/awstats/wwwroot/classes/.*
+
 %define_webapps/etc/webapps
 %define_webapp %{name}
 %define_sysconfdir %{_webapps}/%{_webapp}
@@ -83,6 +86,7 @@ install -d 
$RPM_BUILD_ROOT{/etc/cron.d,%{_sysconfdir},%{_bindir}} \
 
 install -p tools/awstats_* $RPM_BUILD_ROOT%{_bindir}
 install -p tools/{logresolvemerge,maillogconvert,urlaliasbuilder}.pl 
$RPM_BUILD_ROOT%{_bindir}
+rm -rf wwwroot/classes/src
 cp -r wwwroot $RPM_BUILD_ROOT%{_datadir}/awstats
 mv $RPM_BUILD_ROOT%{_datadir}/awstats/wwwroot/cgi-bin/awstats.model.conf 
$RPM_BUILD_ROOT%{_sysconfdir}
 mv $RPM_BUILD_ROOT%{_datadir}/awstats/wwwroot/cgi-bin/{lang,lib,plugins} 
$RPM_BUILD_ROOT%{_datadir}/%{name}


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/awstats.git/commitdiff/02ef1aefbf470c0c1376abfe8a1c424696c79be6

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: perl-Data-Validate-IP: Data-Validate-IP-0.30.tar.gz

2021-11-24 Thread hawk

Request by: hawk


Files fetched: 1

STORED: 
http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.30.tar.gz
1302d60a6a0670b4105c9b7478a37992  Data-Validate-IP-0.30.tar.gz
Size: 41761 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/perl-Data-Validate-IP] - updated to 0.30

2021-11-24 Thread hawk

commit 729c93dc6fe8ea21047f87e9b0dbcba11813ad04
Author: Marcin Krol 
Date:   Wed Nov 24 18:04:28 2021 +0100

- updated to 0.30

 perl-Data-Validate-IP.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/perl-Data-Validate-IP.spec b/perl-Data-Validate-IP.spec
index 8cd524f..240ddbb 100644
--- a/perl-Data-Validate-IP.spec
+++ b/perl-Data-Validate-IP.spec
@@ -6,12 +6,12 @@
 %definepnamValidate-IP
 Summary:   Perl IP address validation routines
 Name:  perl-Data-Validate-IP
-Version:   0.24
+Version:   0.30
 Release:   1
 License:   GPL+ or Artistic
 Group: Development/Libraries
 Source0:   
http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Data-Validate-IP-%{version}.tar.gz
-# Source0-md5: 3476e091f870b19ba53cb917ab8c7167
+# Source0-md5: 1302d60a6a0670b4105c9b7478a37992
 URL:   http://search.cpan.org/dist/Data-Validate-IP
 BuildRequires: rpm-perlprov >= 4.1-13
 %if %{with tests}


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/perl-Data-Validate-IP.git/commitdiff/729c93dc6fe8ea21047f87e9b0dbcba11813ad04

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: awstats: awstats-7.8.tar.gz

2021-11-18 Thread hawk

Request by: hawk


Files fetched: 1

STORED: http://awstats.sourceforge.net/files/awstats-7.8.tar.gz
46986723e04b1980389193153915e760  awstats-7.8.tar.gz
Size: 2938878 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/awstats] - updated to 7.8

2021-11-18 Thread hawk

commit e4fd165904ac04337fe605565616639b013a9bbe
Author: Marcin Krol 
Date:   Thu Nov 18 22:34:36 2021 +0100

- updated to 7.8

 awstats.spec | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/awstats.spec b/awstats.spec
index f183e0b..4ede0d6 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -7,12 +7,12 @@
 Summary:   Advanced Web Statistics is a free powerful server log file 
analyzer
 Summary(pl.UTF-8): Zaawansowany program do analizowania logów serwera
 Name:  awstats
-Version:   7.7
-Release:   2
+Version:   7.8
+Release:   1
 License:   GPL v3+
 Group: Applications/Networking
 Source0:   http://awstats.sourceforge.net/files/%{name}-%{version}.tar.gz
-# Source0-md5: a69ee5127fcf38b12d47856fab3d57e4
+# Source0-md5: 46986723e04b1980389193153915e760
 Source1:   %{name}.crontab
 Source2:   %{name}-httpd.conf
 Source3:   %{name}.conf
@@ -20,7 +20,7 @@ Source4:  %{name}-lighttpd.conf
 Patch0:%{name}_conf.patch
 Patch1:%{name}-created_dir_mode.patch
 Patch2:%{name}-PLD.patch
-URL:   http://awstats.sourceforge.net/
+URL:   https://awstats.sourceforge.io/
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.264
 Requires(triggerpostun):   sed >= 4.0


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/awstats.git/commitdiff/e4fd165904ac04337fe605565616639b013a9bbe

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: chrony: chrony-4.1.tar.gz

2021-09-18 Thread hawk

Request by: hawk


Files fetched: 1

STORED: http://download.tuxfamily.org/chrony/chrony-4.1.tar.gz
7133880806887b629678c36a48217806  chrony-4.1.tar.gz
Size: 564648 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/chrony] - updated to 4.1

2021-09-18 Thread hawk

commit 3b8450f1f57e1b0ebbaf33c1d8711250418755d2
Author: Marcin Krol 
Date:   Sat Sep 18 13:29:21 2021 +0200

- updated to 4.1

 allow-clock_adjtime.patch | 26 --
 chrony.spec   | 12 +---
 chronyd.upstart   | 22 --
 dont-force-index.patch| 22 --
 fix-seccomp-build.patch   | 24 +++-
 5 files changed, 16 insertions(+), 90 deletions(-)
---
diff --git a/chrony.spec b/chrony.spec
index af9ad09..87f8016 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -4,20 +4,19 @@
 Summary:   An NTP client/server
 Summary(pl.UTF-8): Klient/serwer NTP
 Name:  chrony
-Version:   3.5
-Release:   6
+Version:   4.1
+Release:   1
 License:   GPL v2
 Group: Daemons
 Source0:   http://download.tuxfamily.org/chrony/%{name}-%{version}.tar.gz
-# Source0-md5: 5f66338bc940a9b51eede8f391e7bed3
+# Source0-md5: 7133880806887b629678c36a48217806
 Source1:   %{name}.conf
 Source2:   %{name}.keys
 Source3:   %{name}d.sysconfig
 Source4:   %{name}d.init
 Source5:   %{name}.logrotate
-Patch0:allow-clock_adjtime.patch
-Patch1:fix-seccomp-build.patch
-Patch2:dont-force-index.patch
+Patch0:fix-seccomp-build.patch
+Patch1:chrony-seccomp.patch
 URL:   http://chrony.tuxfamily.org/
 BuildRequires: asciidoc
 BuildRequires: bison
@@ -65,7 +64,6 @@ Internetu, obsługuje także komputery na stałym łączu.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 # NOTE: It is not autoconf generated configre
diff --git a/allow-clock_adjtime.patch b/allow-clock_adjtime.patch
deleted file mode 100644
index 2fa3bac..000
--- a/allow-clock_adjtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0cf506c92967c84f9ed83ba9e1be946a7fda6425 Mon Sep 17 00:00:00 2001
-From: Miroslav Lichvar 
-Date: Mon, 2 Dec 2019 12:47:13 +0100
-Subject: sys_linux: allow clock_adjtime in seccomp filter
-
-The adjtimex() function in glibc was switched to the clock_adjtime
-system call.
-
-diff --git a/sys_linux.c b/sys_linux.c
-index 63eb8f1..fcf89c2 100644
 a/sys_linux.c
-+++ b/sys_linux.c
-@@ -478,8 +478,8 @@ SYS_Linux_EnableSystemCallFilter(int level)
- {
-   const int syscalls[] = {
- /* Clock */
--SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday),
--SCMP_SYS(settimeofday), SCMP_SYS(time),
-+SCMP_SYS(adjtimex), SCMP_SYS(clock_adjtime), SCMP_SYS(clock_gettime),
-+SCMP_SYS(gettimeofday), SCMP_SYS(settimeofday), SCMP_SYS(time),
- /* Process */
- SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid),
- SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn),
--- 
-cgit v0.10.2
-
diff --git a/chronyd.upstart b/chronyd.upstart
deleted file mode 100644
index 0e25550..000
--- a/chronyd.upstart
+++ /dev/null
@@ -1,22 +0,0 @@
-description "NTP daemon"
-
-start on pld.network-started
-stop on pld.shutdown-started
-
-env NTPD_USER="ntp"
-env NTPD_OPTIONS=""
-
-respawn
-
-pre-start script
-   # do not bother to start if not configured
-   [ -f /etc/ntp/chrony.conf ] || /sbin/initctl stop
-end script
-
-script
-   # Source old-style ntp service configuration
-   [ -f /etc/sysconfig/chronyd ] && . /etc/sysconfig/chronyd
-
-   export USE_UPSTART=no
-   exec /etc/rc.d/init.d/chronyd start
-end script
diff --git a/dont-force-index.patch b/dont-force-index.patch
deleted file mode 100644
index 32cb39c..000
--- a/dont-force-index.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/ntp_io.c b/ntp_io.c
-index ec844cb..e92d27e 100644
 a/ntp_io.c
-+++ b/ntp_io.c
-@@ -827,8 +827,6 @@ NIO_SendPacket(NTP_Packet *packet, NTP_Remote_Address 
*remote_addr,
- 
- ipi = (struct in_pktinfo *) CMSG_DATA(cmsg);
- ipi->ipi_spec_dst.s_addr = htonl(local_addr->ip_addr.addr.in4);
--if (local_addr->if_index != INVALID_IF_INDEX)
--  ipi->ipi_ifindex = local_addr->if_index;
-   }
- #endif
- 
-@@ -847,8 +845,6 @@ NIO_SendPacket(NTP_Packet *packet, NTP_Remote_Address 
*remote_addr,
- ipi = (struct in6_pktinfo *) CMSG_DATA(cmsg);
- memcpy(>ipi6_addr.s6_addr, _addr->ip_addr.addr.in6,
- sizeof(ipi->ipi6_addr.s6_addr));
--if (local_addr->if_index != INVALID_IF_INDEX)
--  ipi->ipi6_ifindex = local_addr->if_index;
-   }
- #endif
- 
diff --git a/fix-seccomp-build.patch b/fix-seccomp-build.patch
index 6888e7e..0c62438 100644
--- a/fix-seccomp-build.patch
+++ b/fix-seccomp-build.patch
@@ -1,13 +1,11 @@
-diff --git a/sys_linux.c b/sys_linux.c
-index 898dc7a7f75..fcd334ecf03 100644
 a/sys_linux.c
-+++ b/sys_linux.c
-@@ -503,7 +503,7 @@ SYS_Linux_EnableSystemCallFilter(int level)
- SCMP_SYS(socketcall),
- /* General I/O */
- SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), 
SCMP_SYS(pipe),
--SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(ppoll), SCMP_SYS(pselect6), 
SCMP_SYS(read),

[packages/chrony] - upstream fix for recent glibc

2021-09-18 Thread hawk

commit b04b61ad2aa42e8353a661b06441b8412d14124e
Author: Marcin Krol 
Date:   Sat Sep 18 13:26:40 2021 +0200

- upstream fix for recent glibc

 chrony-seccomp.patch | 30 ++
 1 file changed, 30 insertions(+)
---
diff --git a/chrony-seccomp.patch b/chrony-seccomp.patch
new file mode 100644
index 000..1cc432d
--- /dev/null
+++ b/chrony-seccomp.patch
@@ -0,0 +1,30 @@
+commit bbbd80bf03223f181d4abf5c8e5fe6136ab6129a
+Author: Miroslav Lichvar 
+Date:   Mon Aug 9 11:48:21 2021 +0200
+
+sys_linux: allow clone3 and pread64 in seccomp filter
+
+These seem to be needed with the latest glibc.
+
+diff --git a/sys_linux.c b/sys_linux.c
+index 50c08431..2b53f722 100644
+--- a/sys_linux.c
 b/sys_linux.c
+@@ -503,6 +503,9 @@ SYS_Linux_EnableSystemCallFilter(int level, 
SYS_ProcessContext context)
+ 
+ /* Process */
+ SCMP_SYS(clone),
++#ifdef __NR_clone3
++SCMP_SYS(clone3),
++#endif
+ SCMP_SYS(exit),
+ SCMP_SYS(exit_group),
+ SCMP_SYS(getpid),
+@@ -595,6 +598,7 @@ SYS_Linux_EnableSystemCallFilter(int level, 
SYS_ProcessContext context)
+ #ifdef __NR_ppoll_time64
+ SCMP_SYS(ppoll_time64),
+ #endif
++SCMP_SYS(pread64),
+ SCMP_SYS(pselect6),
+ #ifdef __NR_pselect6_time64
+ SCMP_SYS(pselect6_time64),


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chrony.git/commitdiff/3b8450f1f57e1b0ebbaf33c1d8711250418755d2

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/chrony] - added comments, use more sets of servers from pool.ntp.org

2021-09-18 Thread hawk

commit 3dd8d6a47a38be47e603ba00f4c28029fdec7d67
Author: Marcin Krol 
Date:   Sat Sep 18 13:28:33 2021 +0200

- added comments, use more sets of servers from pool.ntp.org

 chrony.conf | 25 +++--
 1 file changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/chrony.conf b/chrony.conf
index f9f3c6e..0c50f18 100644
--- a/chrony.conf
+++ b/chrony.conf
@@ -1,7 +1,19 @@
+# Welcome to the chrony configuration file. See chrony.conf(5) for more
+# information about usuable directives.
+
 # Use public servers from the pool.ntp.org project.
 # Please consider joining the pool (http://www.pool.ntp.org/join.html).
-pool pool.ntp.org iburst
- 
+pool 0.pool.ntp.org iburst
+pool 1.pool.ntp.org iburst
+pool 2.pool.ntp.org iburst
+pool 3.pool.ntp.org iburst
+
+# This directive specify the location of the file containing ID/key pairs for
+# NTP authentication.
+keyfile /etc/ntp/keys
+
+# This directive specify the file into which chronyd will store the rate
+# information.
 driftfile /var/lib/ntp/drift
 
 # Allow client access from local network.
@@ -10,11 +22,9 @@ driftfile /var/lib/ntp/drift
 # Serve time even if not synchronized to any NTP server.
 #local stratum 10
 
-keyfile /etc/ntp/keys
-
-#  Allow the system clock to be stepped in the first three updates
+# Allow the system clock to be stepped in the first three updates
 # if its offset is larger than 1 second.
-makestep 1.0 3
+makestep 1 3
 
 # Enable kernel synchronization of the real-time clock (RTC).
 rtcsync
@@ -23,5 +33,8 @@ rtcsync
 # an error larger than 0.5 seconds.
 logchange 0.5
 
+# Log files location
 logdir /var/log/chrony
+
+# Uncomment the following line to turn logging on.
 #log measurements statistics tracking


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chrony.git/commitdiff/3b8450f1f57e1b0ebbaf33c1d8711250418755d2

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: ldb: ldb-2.3.0.tar.gz

2021-07-07 Thread hawk

Request by: hawk


Files fetched: 1

STORED: https://download.samba.org/pub/ldb/ldb-2.3.0.tar.gz
fe4b1f17f77e2ea52b4e1320d927844c  ldb-2.3.0.tar.gz
Size: 1686378 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/ldb] - updated to 2.3.0

2021-07-07 Thread hawk

commit 5bcca940b4decc3052bbd122dd512c5fe4022700
Author: Marcin Krol 
Date:   Thu Jul 8 03:23:30 2021 +0200

- updated to 2.3.0

 ldb.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/ldb.spec b/ldb.spec
index 5078d44..c0a80c0 100644
--- a/ldb.spec
+++ b/ldb.spec
@@ -6,18 +6,18 @@
 # lmdb support requires 64-bit size_t
 %undefine  with_lmdb
 %endif
-%definetalloc_version  2:2.3.1
+%definetalloc_version  2:2.3.2
 %definetdb_version 2:1.4.3
 %definetevent_version  0.10.2
 Summary:   LDAP-like embedded database
 Summary(pl.UTF-8): Wbudowana baza danych podobna do LDAP
 Name:  ldb
-Version:   2.2.1
+Version:   2.3.0
 Release:   1
 License:   LGPL v3+
 Group: Libraries
 Source0:   https://download.samba.org/pub/ldb/%{name}-%{version}.tar.gz
-# Source0-md5: 3bc1e8a13cdc80fe43997e5492e7ce40
+# Source0-md5: fe4b1f17f77e2ea52b4e1320d927844c
 URL:   https://ldb.samba.org/
 BuildRequires: cmocka-devel >= 1.1.3
 BuildRequires: docbook-style-xsl


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ldb.git/commitdiff/5bcca940b4decc3052bbd122dd512c5fe4022700

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[projects/pld-builder.new] - fixed mail encoding errors

2021-05-10 Thread hawk

commit 149a8bcbb65a9d5465c48827fec76b396ee0864e
Author: Marcin Krol 
Date:   Mon May 10 18:02:13 2021 +0200

- fixed mail encoding errors

 PLD_Builder/mailer.py | 13 -
 1 file changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/PLD_Builder/mailer.py b/PLD_Builder/mailer.py
index 7d90091..a9f2c8f 100644
--- a/PLD_Builder/mailer.py
+++ b/PLD_Builder/mailer.py
@@ -7,12 +7,7 @@ from io import StringIO
 from config import config
 import shutil
 import log
-
-def recode(s):
-if s.__class__ == ''.__class__:
-return s.encode('iso-8859-1', 'replace').decode('us-ascii', 'replace')
-else:
-return s.decode('us-ascii', 'replace')
+import util
 
 class Message:
 def __init__(self):
@@ -36,10 +31,10 @@ class Message:
 del self.headers[n]
 
 def write_line(self, l):
-self.body.write(recode("%s\n" % l))
+self.body.write(util.to_str("%s\n" % l))
 
 def write(self, s):
-self.body.write(recode(s))
+self.body.write(util.to_str(s))
 
 def append_log(self, log):
 s = os.stat(log)
@@ -53,7 +48,7 @@ class Message:
 line = 0
 for l in f:
 if line < 100 or line > line_cnt - 100:
-self.body.write(recode(l))
+self.body.write(util.to_str(l))
 if line == line_cnt - 100:
 self.body.write("\n\n[...]\n\n")
 line += 1


 gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/149a8bcbb65a9d5465c48827fec76b396ee0864e

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/tcp_wrappers] - rediffed

2021-05-09 Thread hawk

commit e5dd8bfaa7a5f267923f09fee219fbb405014704
Author: Marcin Krol 
Date:   Mon May 10 00:37:56 2021 +0200

- rediffed

 tcp_wrappers-Makefile.patch | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/tcp_wrappers-Makefile.patch b/tcp_wrappers-Makefile.patch
index e0d88b8..cebb126 100644
--- a/tcp_wrappers-Makefile.patch
+++ b/tcp_wrappers-Makefile.patch
@@ -1,7 +1,7 @@
-diff -urN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
 tcp_wrappers_7.6.orig/Makefile Mon Dec 13 13:58:15 1999
-+++ tcp_wrappers_7.6/Makefile  Mon Dec 13 14:07:48 1999
-@@ -71,6 +71,7 @@
+diff -urNp -x '*.orig' tcp_wrappers_7.6.org/Makefile tcp_wrappers_7.6/Makefile
+--- tcp_wrappers_7.6.org/Makefile  2021-05-10 00:37:26.282798762 +0200
 tcp_wrappers_7.6/Makefile  2021-05-10 00:37:26.357798762 +0200
+@@ -71,6 +71,7 @@ what:
  #
  # HP-UX SCO Unicos
  #REAL_DAEMON_DIR=/etc/...
@@ -9,7 +9,7 @@ diff -urN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  # End of mandatory section
  ##
-@@ -150,8 +151,8 @@
+@@ -150,8 +151,8 @@ netbsd:
  
  linux:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
@@ -20,7 +20,7 @@ diff -urN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  linux-old:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
-@@ -504,7 +508,7 @@
+@@ -515,7 +516,7 @@ AR = ar
  # Uncomment the next definition to turn on the language extensions
  # (examples: allow, deny, banners, twist and spawn).
  # 
@@ -29,7 +29,7 @@ diff -urN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  
  # Optional: Changing the default disposition of logfile records
-@@ -527,7 +531,7 @@
+@@ -538,7 +539,7 @@ AR = ar
  #
  # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
  
@@ -38,7 +38,7 @@ diff -urN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  # The syslog priority at which successful connections are logged.
  
-@@ -544,7 +548,7 @@
+@@ -555,7 +556,7 @@ SEVERITY= LOG_INFO # LOG_INFO is normall
  # and with Solaris < 2.4. APPEND_DOT will not work with hostnames taken
  # from /etc/hosts or from NIS maps. It does work with DNS through NIS.
  #
@@ -47,7 +47,7 @@ diff -urN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  ##
  # Optional: Always attempt remote username lookups
-@@ -564,7 +568,7 @@
+@@ -575,7 +576,7 @@ SEVERITY= LOG_INFO # LOG_INFO is normall
  # still do selective username lookups as documented in the hosts_access.5
  # and hosts_options.5 manual pages (`nroff -man' format).
  #
@@ -56,7 +56,7 @@ diff -urN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  #
  # The default username lookup timeout is 10 seconds. This may not be long
  # enough for slow hosts or networks, but is enough to irritate PC users.
-@@ -603,7 +607,7 @@
+@@ -614,7 +615,7 @@ ACCESS = -DHOSTS_ACCESS
  # look for access control information. Watch out for the quotes and
  # backslashes when you make changes.
  
@@ -65,7 +65,7 @@ diff -urN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  
  # Optional: dealing with host name/address conflicts
-@@ -623,7 +627,7 @@
+@@ -634,7 +635,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\
  # Paranoid mode implies hostname lookup. In order to disable hostname
  # lookups altogether, see the next section.
  
@@ -74,7 +74,7 @@ diff -urN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  
  # Optional: turning off hostname lookups
-@@ -636,7 +640,7 @@
+@@ -647,7 +648,7 @@ PARANOID= -DPARANOID
  # In order to perform selective hostname lookups, disable paranoid
  # mode (see previous section) and comment out the following definition.
  
@@ -83,18 +83,18 @@ diff -urN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  #
  # Optional: Turning on host ADDRESS checking
-@@ -661,7 +661,7 @@
- #
- # Uncomment the following macro definition if your getsockopt() is OK.
+@@ -673,7 +674,7 @@ HOSTNAME= -DALWAYS_HOSTNAME
+ # source-routed traffic in the kernel. Examples: 4.4BSD derivatives,
+ # Solaris 2.x, and Linux. See your system documentation for details.
  #
 -# KILL_OPT= -DKILL_IP_OPTIONS
 +KILL_OPT= -DKILL_IP_OPTIONS
  
  ## End configuration options
  
-@@ -671,7 +672,7 @@
+@@ -685,7 +686,7 @@ SHELL  = /bin/sh
  
- %.lo:;$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $*.c
+ %.lo:;$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $*.c
  
 -CFLAGS= -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
 +CFLAGS= -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \


 gitweb:

[packages/heimdal] - rediffed

2021-05-09 Thread hawk

commit b0db110a600bd207d04a07441f102469d2fc4435
Author: Marcin Krol 
Date:   Mon May 10 00:33:19 2021 +0200

- rediffed

 heimdal-dbpaths.patch | 65 
 heimdal-info.patch| 14 ++-
 heimdal-libadd.patch  | 14 +--
 heimdal-sbindir.patch | 68 ++-
 heimdal-signal.patch  | 53 ---
 5 files changed, 111 insertions(+), 103 deletions(-)
---
diff --git a/heimdal-dbpaths.patch b/heimdal-dbpaths.patch
index de51594..61aa4ff 100644
--- a/heimdal-dbpaths.patch
+++ b/heimdal-dbpaths.patch
@@ -1,7 +1,7 @@
-diff -urbB heimdal-0.7/configure.ac heimdal-0.7.org/configure.ac
 heimdal-0.7/configure.ac   2005-06-16 18:29:14.0 +0200
-+++ heimdal-0.7.org/configure.ac   2005-07-03 18:58:54.158074120 +0200
-@@ -16,7 +16,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/configure.ac 
heimdal-7.7.0/configure.ac
+--- heimdal-7.7.0.org/configure.ac 2019-06-07 08:21:39.0 +0200
 heimdal-7.7.0/configure.ac 2021-05-10 00:31:52.351798762 +0200
+@@ -24,7 +24,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
  AC_PREFIX_DEFAULT(/usr/heimdal)
  
  test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
@@ -10,9 +10,10 @@ diff -urbB heimdal-0.7/configure.ac 
heimdal-0.7.org/configure.ac
  
  AC_CANONICAL_HOST
  CANONICAL_HOST=$host
 heimdal-1.7.old/doc/setup.texi 2016-11-15 05:29:47.0 +0200
-+++ heimdal-1.7.old/doc/setup.texi 2016-11-19 00:47:14.126318922 +0200
-@@ -122,8 +122,8 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/doc/setup.texi 
heimdal-7.7.0/doc/setup.texi
+--- heimdal-7.7.0.org/doc/setup.texi   2019-06-07 08:21:35.0 +0200
 heimdal-7.7.0/doc/setup.texi   2021-05-10 00:31:52.352798762 +0200
+@@ -122,8 +122,8 @@ The database library will look for the d
  Make sure the directory has restrictive permissions.
  
  @example
@@ -23,7 +24,7 @@ diff -urbB heimdal-0.7/configure.ac 
heimdal-0.7.org/configure.ac
  @end example
  
  Heimdal supports various database backends: lmdb (LMDB), db3 (Berkeley
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ To use LDAP, see @xref{Using LDAP to sto
  The keys of all the principals are stored in the database.  If you
  choose to, these can be encrypted with a master key.  You do not have to
  remember this key (or password), but just to enter it once and it will
@@ -32,7 +33,7 @@ diff -urbB heimdal-0.7/configure.ac 
heimdal-0.7.org/configure.ac
  master key, run @samp{kstash} to create this master key:
  
  @example
-@@ -335,14 +335,14 @@
+@@ -335,14 +335,14 @@ want to start it from @command{inetd} yo
  one below to your @file{/etc/inetd.conf}.
  
  @example
@@ -49,7 +50,7 @@ diff -urbB heimdal-0.7/configure.ac 
heimdal-0.7.org/configure.ac
  syntax:
  @smallexample
  principal   [priv1,priv2,...]   [glob-pattern]
-@@ -518,7 +518,7 @@
+@@ -518,7 +518,7 @@ for the database) and a keytab with the
  
  @example
  slave# ktutil get -p foo/admin hprop/`hostname`
@@ -58,7 +59,7 @@ diff -urbB heimdal-0.7/configure.ac 
heimdal-0.7.org/configure.ac
  slave# hpropd
  @end example
  
-@@ -578,7 +578,7 @@
+@@ -578,7 +578,7 @@ checked after 30 seconds of no event.
  The program that runs on the master is @command{ipropd-master} and all
  clients run @command{ipropd-slave}.
  
@@ -67,7 +68,7 @@ diff -urbB heimdal-0.7/configure.ac 
heimdal-0.7.org/configure.ac
  the slaves that the database should be propagated to.  Each line contains
  the full name of the principal (for example
  @samp{iprop/hemligare.foo.se@@FOO.SE}).
-@@ -594,25 +594,25 @@
+@@ -594,25 +594,25 @@ for every slave.
  
  
  @example
@@ -98,7 +99,7 @@ diff -urbB heimdal-0.7/configure.ac 
heimdal-0.7.org/configure.ac
  @end example
  
  To manage the iprop log file you should use the @command{iprop-log}
-@@ -623,9 +623,9 @@
+@@ -623,9 +623,9 @@ command. With it you can dump, truncate
  Both the master and slave provides status of the world as they see it.
  
  The master write outs the current status of the slaves, last seen and
@@ -110,7 +111,7 @@ diff -urbB heimdal-0.7/configure.ac 
heimdal-0.7.org/configure.ac
  
  These locations can be changed with command line options, and in the
  case of @command{ipropd_master}, the configuration file.
-@@ -1567,7 +1567,7 @@
+@@ -1567,7 +1567,7 @@ mapping between a certificate and princi
  Note that the file contents are space sensitive.
  
  @example
@@ -119,10 +120,10 @@ diff -urbB heimdal-0.7/configure.ac 
heimdal-0.7.org/configure.ac
  # comments starts with #
  lha@@EXAMPLE.ORG:C=SE,O=Stockholm universitet,CN=Love,UID=lha
  lha@@EXAMPLE.ORG:CN=Love,UID=lha
-diff -urbB heimdal-0.7/kadmin/kadmind.8 heimdal-0.7.org/kadmin/kadmind.8
 heimdal-0.7/kadmin/kadmind.8   2005-06-16 18:27:56.0 +0200
-+++ heimdal-0.7.org/kadmin/kadmind.8   2005-07-03 18:58:54.160073816 +0200
-@@ -85,7 +85,7 @@
+diff -urNp -x '*.orig' heimdal-7.7.0.org/kadmin/kadmind.8 
heimdal-7.7.0/kadmin/kadmind.8
+---

[packages/iputils] - BR docbook-style-xsl, added systemd bcond to allow building on systems without systemd (unit fil

2021-05-09 Thread hawk

commit c0c76e5a4ed25133a3bc8b1749d1ebbf542b2b1e
Author: Marcin Krol 
Date:   Sun May 9 23:12:21 2021 +0200

- BR docbook-style-xsl, added systemd bcond to allow building on systems
  without systemd (unit files are not installed if systemd is not found)

 iputils.spec | 4 
 1 file changed, 4 insertions(+)
---
diff --git a/iputils.spec b/iputils.spec
index 04bfcda..79a07ad 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,3 +1,4 @@
+%bcond_without systemd # systemd
 Summary:   Utilities for IPv4/IPv6 networking
 Summary(pl.UTF-8): Użytki przeznaczone dla pracy z siecią IPv4/IPv6
 Summary(ru.UTF-8): Набор базовых сетевых утилит (ping, tracepath etc.)
@@ -15,6 +16,7 @@ Source0:  
https://github.com/iputils/iputils/archive/%{version}.tar.gz
 Patch0:%{name}-libcap.patch
 URL:   https://github.com/iputils/iputils
 BuildRequires: docbook-dtd31-sgml
+BuildRequires: docbook-style-xsl
 BuildRequires: docbook-utils >= 0.6.10
 BuildRequires: gcc >= 5:3.2
 BuildRequires: gettext-tools
@@ -155,9 +157,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/tracepath4.8*
 %{_mandir}/man8/tracepath6.8*
 %{_mandir}/man8/traceroute6.8*
+%if %{with systemd}
 %{systemdunitdir}/ninfod.service
 %{systemdunitdir}/rarpd@.service
 %{systemdunitdir}/rdisc.service
+%endif
 
 %files -n ping
 %defattr(644,root,root,755)


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iputils.git/commitdiff/c0c76e5a4ed25133a3bc8b1749d1ebbf542b2b1e

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/libidn2] - added apidocs bcond and subpackage

2021-05-09 Thread hawk

commit f4508c0710392248dd5097ce2fbe5c23f957b565
Author: Marcin Krol 
Date:   Sun May 9 18:59:20 2021 +

- added apidocs bcond and subpackage

 libidn2.spec | 28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/libidn2.spec b/libidn2.spec
index 02e4046..4d6574a 100644
--- a/libidn2.spec
+++ b/libidn2.spec
@@ -1,5 +1,6 @@
 #
 # Conditional build:
+%bcond_without apidocs # API documentation
 %bcond_withtests   # unit tests
 
 Summary:   Free software implementation of IDNA2008
@@ -17,7 +18,7 @@ URL:  http://www.gnu.org/software/libidn/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.10
 BuildRequires: gettext-tools >= 0.19.3
-BuildRequires: gtk-doc >= 1.14
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.14}
 BuildRequires: help2man
 BuildRequires: libtool >= 2:2.0
 BuildRequires: libunistring-devel
@@ -63,6 +64,19 @@ Static libidn2 library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libidn2.
 
+%package apidocs
+Summary:   libidn2 API documentation
+Summary(pl.UTF-8): Dokumentacja API libidb2
+Group: Documentation
+Requires:  gtk-doc-common
+BuildArch: noarch
+
+%description apidocs
+libblkid API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API libblkid.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -79,6 +93,7 @@ Statyczna biblioteka libidn2.
 %{__automake}
 %configure \
--disable-silent-rules \
+   %{?with_apidocs:--enable-gtk-doc} \
--with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -91,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
DESTDIR=$RPM_BUILD_ROOT
 
+%if !%{with apidocs}
+%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}/libidn2
+%endif
+
 %find_lang %{name}
 
 %clean
@@ -120,8 +139,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/idn2.h
 %{_pkgconfigdir}/libidn2.pc
 %{_mandir}/man3/idn2_*.3*
-%{_gtkdocdir}/libidn2
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libidn2.a
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libidn2
+%endif


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libidn2.git/commitdiff/f4508c0710392248dd5097ce2fbe5c23f957b565

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/util-linux] - spaces to tabs

2021-05-09 Thread hawk

commit 5ae167c764258d51b65a965997b830fc8f533541
Author: Marcin Krol 
Date:   Sun May 9 18:39:13 2021 +

- spaces to tabs

 util-linux.spec | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index b7573ea..91858cd 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -484,11 +484,11 @@ Biblioteka do obsługi identyfikacji urządzeń i 
wydobywania tokenów -
 wersja statyczna dla dietlibc.
 
 %package -n libblkid-apidocs
-Summary:libblkid API documentation
-Summary(pl.UTF-8):  Dokumentacja API libblkid
-Group:  Documentation
-Requires:   gtk-doc-common
-BuildArch:  noarch
+Summary:   libblkid API documentation
+Summary(pl.UTF-8): Dokumentacja API libblkid
+Group: Documentation
+Requires:  gtk-doc-common
+BuildArch: noarch
 
 %description -n libblkid-apidocs
 libblkid API documentation.
@@ -626,11 +626,11 @@ Static version of fdisk library.
 Statyczna wersja biblioteki fdisk.
 
 %package -n libfdisk-apidocs
-Summary:libfdisk API documentation
-Summary(pl.UTF-8):  Dokumentacja API libfdisk
-Group:  Documentation
-Requires:   gtk-doc-common
-BuildArch:  noarch
+Summary:   libfdisk API documentation
+Summary(pl.UTF-8): Dokumentacja API libfdisk
+Group: Documentation
+Requires:  gtk-doc-common
+BuildArch: noarch
 
 %description -n libfdisk-apidocs
 libfdisk API documentation.
@@ -679,11 +679,11 @@ Static version of mount library.
 Statyczna wersja biblioteki mount.
 
 %package -n libmount-apidocs
-Summary:libmount API documentation
-Summary(pl.UTF-8):  Dokumentacja API libmount
-Group:  Documentation
-Requires:   gtk-doc-common
-BuildArch:  noarch
+Summary:   libmount API documentation
+Summary(pl.UTF-8): Dokumentacja API libmount
+Group: Documentation
+Requires:  gtk-doc-common
+BuildArch: noarch
 
 %description -n libmount-apidocs
 libmount API documentation.
@@ -756,11 +756,11 @@ Static version of smartcols library.
 Statyczna wersja biblioteki smartcols.
 
 %package -n libsmartcols-apidocs
-Summary:libsmartcols API documentation
-Summary(pl.UTF-8):  Dokumentacja API libsmartcols
-Group:  Documentation
-Requires:   gtk-doc-common
-BuildArch:  noarch
+Summary:   libsmartcols API documentation
+Summary(pl.UTF-8): Dokumentacja API libsmartcols
+Group: Documentation
+Requires:  gtk-doc-common
+BuildArch: noarch
 
 %description -n libsmartcols-apidocs
 libsmartcols API documentation.


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/5ae167c764258d51b65a965997b830fc8f533541

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/hostname] - rediffed

2021-05-09 Thread hawk

commit 51e0bef30c3c8332ed8685241b9f6d7c557fa1ee
Author: Marcin Krol 
Date:   Sun May 9 20:19:16 2021 +0200

- rediffed

 hostname-rh.patch | 68 ---
 1 file changed, 35 insertions(+), 33 deletions(-)
---
diff --git a/hostname-rh.patch b/hostname-rh.patch
index 151d6af..56b06ac 100644
--- a/hostname-rh.patch
+++ b/hostname-rh.patch
@@ -1,7 +1,35 @@
 hostname/hostname.1.orig   2012-12-06 16:18:46.0 +0100
-+++ hostname/hostname.12012-12-09 11:54:21.413750393 +0100
-@@ -84,6 +84,33 @@
- .B "THE FQDN"
+diff -urNp -x '*.orig' hostname.org/Makefile hostname/Makefile
+--- hostname.org/Makefile  2018-01-30 11:25:42.0 +0100
 hostname/Makefile  2021-05-09 20:19:07.910374609 +0200
+@@ -10,21 +10,17 @@ OBJS=hostname.o
+ 
+ hostname: $(OBJS)
+   $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+-  ln -fs hostname dnsdomainname
+-  ln -fs hostname domainname
+-  ln -fs hostname ypdomainname
+-  ln -fs hostname nisdomainname
+ 
+ install: hostname
+   install -d ${BASEDIR}$(MANDIR)/man1
+-  install -o root -g root -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1
++  install -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1
+   ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/dnsdomainname.1
+   ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/domainname.1
+   ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/ypdomainname.1
+   ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/nisdomainname.1
+ 
+   install -d ${BASEDIR}$(BINDIR)
+-  install -o root -g root -m 0755 hostname ${BASEDIR}$(BINDIR)
++  install -m 0755 hostname ${BASEDIR}$(BINDIR)
+   ln -fs hostname ${BASEDIR}$(BINDIR)/dnsdomainname
+   ln -fs hostname ${BASEDIR}$(BINDIR)/domainname
+   ln -fs hostname ${BASEDIR}$(BINDIR)/nisdomainname
+diff -urNp -x '*.orig' hostname.org/hostname.1 hostname/hostname.1
+--- hostname.org/hostname.12018-09-27 10:41:06.0 +0200
 hostname/hostname.12021-05-09 20:19:07.910374609 +0200
+@@ -80,6 +80,33 @@ complete FQDN of the system is returned
+ .B THE FQDN
  below).
  
 +.LP
@@ -34,7 +62,7 @@
  .SS "SET NAME"
  When called with one argument or with the
  .B \-\-file
-@@ -99,7 +126,7 @@
+@@ -95,7 +122,7 @@ and
  use
  .BR setdomainname (2).
  Note, that this is effective only until the next reboot.
@@ -43,7 +71,7 @@
  .LP
  Note, that only the super-user can change the names.
  .LP
-@@ -110,10 +137,10 @@
+@@ -106,10 +133,10 @@ command (see
  below).
  .LP
  The host name is usually set once at system startup in
@@ -56,7 +84,7 @@
  
  .SS THE FQDN
  The FQDN (Fully Qualified Domain Name) of the system is the name that the
-@@ -248,7 +275,7 @@
+@@ -241,7 +268,7 @@ try IPv6 lookups first by using the
  option in
  .BR /etc/resolv.conf .
  .SH FILES
@@ -65,29 +93,3 @@
  Historically this file was supposed to only contain the hostname and not the
  full canonical FQDN. Nowadays most software is able to cope with a full FQDN
  here. This file is read at boot time by the system initialization scripts to
 hostname/Makefile.orig 2016-02-28 12:33:13.235854973 +0100
-+++ hostname/Makefile  2016-02-28 12:35:01.225850445 +0100
-@@ -10,21 +10,17 @@
- 
- hostname: $(OBJS)
-   $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
--  ln -fs hostname dnsdomainname
--  ln -fs hostname domainname
--  ln -fs hostname ypdomainname
--  ln -fs hostname nisdomainname
- 
- install: hostname
-   install -d ${BASEDIR}$(MANDIR)/man1
--  install -o root -g root -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1
-+  install -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1
-   ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/dnsdomainname.1
-   ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/domainname.1
-   ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/ypdomainname.1
-   ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/nisdomainname.1
- 
-   install -d ${BASEDIR}$(BINDIR)
--  install -o root -g root -m 0755 hostname ${BASEDIR}$(BINDIR)
-+  install -m 0755 hostname ${BASEDIR}$(BINDIR)
-   ln -fs hostname ${BASEDIR}$(BINDIR)/dnsdomainname
-   ln -fs hostname ${BASEDIR}$(BINDIR)/domainname
-   ln -fs hostname ${BASEDIR}$(BINDIR)/nisdomainname


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hostname.git/commitdiff/51e0bef30c3c8332ed8685241b9f6d7c557fa1ee

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/mingetty] - rediffed

2021-05-09 Thread hawk

commit 7ad2022a1ff5dc895797d6dc7f66b551a52b9a1c
Author: Marcin Krol 
Date:   Sun May 9 20:16:10 2021 +0200

- rediffed

 mingetty-defaultlogin.patch | 34 +-
 mingetty-mono-console.patch | 28 ++--
 2 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/mingetty-defaultlogin.patch b/mingetty-defaultlogin.patch
index 9a150e4..db2f192 100644
--- a/mingetty-defaultlogin.patch
+++ b/mingetty-defaultlogin.patch
@@ -1,7 +1,7 @@
-diff -urN mingetty-1.07.org/mingetty.8 mingetty-1.07/mingetty.8
 mingetty-1.07.org/mingetty.8   2007-02-11 18:59:03.438623000 +0100
-+++ mingetty-1.07/mingetty.8   2007-02-11 19:00:32.962623000 +0100
-@@ -6,7 +6,7 @@
+diff -urNp -x '*.orig' mingetty-1.08.org/mingetty.8 mingetty-1.08/mingetty.8
+--- mingetty-1.08.org/mingetty.8   2021-05-09 20:16:02.173374609 +0200
 mingetty-1.08/mingetty.8   2021-05-09 20:16:02.210374609 +0200
+@@ -6,7 +6,7 @@ mingetty \- minimal getty for consoles
  [\-\-noclear] [\-\-nonewline] [\-\-noissue] [\-\-nohangup] [\-\-nohostname]
  [\-\-long\-hostname] [\-\-loginprog=/bin/login] [\-\-nice=10] [\-\-delay=5]
  [\-\-chdir=/home] [\-\-chroot=/chroot] [\-\-autologin username]
@@ -10,7 +10,7 @@ diff -urN mingetty-1.07.org/mingetty.8 
mingetty-1.07/mingetty.8
  .I tty
  .PP
  .SH DESCRIPTION
-@@ -60,6 +61,9 @@
+@@ -61,6 +61,9 @@ Change into this directory before callin
  .B \-\-chroot /chroot
  Call chroot() with this directory name.
  .TP
@@ -20,10 +20,10 @@ diff -urN mingetty-1.07.org/mingetty.8 
mingetty-1.07/mingetty.8
  .B \-\-autologin username
  Log the specified user automatically in without asking for
  a login name and password. Check the \-f option from
-diff -urN mingetty-1.07.org/mingetty.c mingetty-1.07/mingetty.c
 mingetty-1.07.org/mingetty.c   2007-02-11 18:58:43.434623000 +0100
-+++ mingetty-1.07/mingetty.c   2007-02-11 19:13:50.262623000 +0100
-@@ -96,6 +96,8 @@
+diff -urNp -x '*.orig' mingetty-1.08.org/mingetty.c mingetty-1.08/mingetty.c
+--- mingetty-1.08.org/mingetty.c   2021-05-09 20:16:02.173374609 +0200
 mingetty-1.08/mingetty.c   2021-05-09 20:16:02.210374609 +0200
+@@ -98,6 +98,8 @@ static int loginpause = 0;
  static int mode = K_RAW;
  /* Set mono terminal type */
  static int mono_term = 0;
@@ -32,7 +32,7 @@ diff -urN mingetty-1.07.org/mingetty.c 
mingetty-1.07/mingetty.c
  
  /* error() - output error messages */
  static void error (const char *fmt, ...)
-@@ -299,6 +301,27 @@
+@@ -301,6 +303,27 @@ static void output_special_char (unsigne
}
  }
  
@@ -60,7 +60,7 @@ diff -urN mingetty-1.07.org/mingetty.c 
mingetty-1.07/mingetty.c
  /* do_prompt - show login prompt, optionally preceded by /etc/issue contents 
*/
  static void do_prompt (int showlogin)
  {
-@@ -318,8 +341,13 @@
+@@ -324,8 +347,13 @@ static void do_prompt (int showlogin)
}
if (nohostname == 0)
printf ("%s ", hn);
@@ -76,7 +76,7 @@ diff -urN mingetty-1.07.org/mingetty.c 
mingetty-1.07/mingetty.c
fflush (stdout);
  }
  
-@@ -372,6 +400,8 @@
+@@ -378,6 +406,8 @@ static char *get_logname (void)
  
*bp++ = c;
}
@@ -85,7 +85,7 @@ diff -urN mingetty-1.07.org/mingetty.c 
mingetty-1.07/mingetty.c
}
  
if (!ascii && (ic = iconv_open("WCHAR_T", "UTF-8"))) {
-@@ -403,7 +433,7 @@
+@@ -409,7 +439,7 @@ static void usage (void)
"[--nohangup] [--nohostname] [--long-hostname] "
"[--loginprog=/bin/login] [--nice=10] [--delay=10] "
"[--chdir=/home] [--chroot=/chroot] [--autologin=user] "
@@ -94,15 +94,15 @@ diff -urN mingetty-1.07.org/mingetty.c 
mingetty-1.07/mingetty.c
"tty' with e.g. tty=tty1", progname);
  }
  
-@@ -411,6 +441,7 @@
-   { "autologin", required_argument, NULL, 'a' },
+@@ -418,6 +448,7 @@ static struct option const long_options[
+   { "loginpause", no_argument, , 'p' },
{ "chdir", required_argument, NULL, 'w' },
{ "chroot", required_argument, NULL, 'r' },
 +  { "defaultlogin", required_argument, NULL, 'u'},
{ "delay", required_argument, NULL, 'd' },
{ "noclear", no_argument, , 1 },
{ "nonewline", no_argument, , 1 },
-@@ -467,6 +498,9 @@
+@@ -474,6 +505,9 @@ int main (int argc, char **argv)
case 'r':
ch_root = optarg;
break;
@@ -112,7 +112,7 @@ diff -urN mingetty-1.07.org/mingetty.c 
mingetty-1.07/mingetty.c
case 'w':
ch_dir = optarg;
break;
-@@ -491,9 +525,15 @@
+@@ -498,9 +532,15 @@ int main (int argc, char **argv)
do_prompt (0);
printf ("login: %s (automatic login)\n", autologin);
logname = autologin;
diff --git a/mingetty-mono-console.patch b/mingetty-mono-console.patch
index b2f7692..d424d64 100644
--- a/mingetty-mono-console.patch
+++ b/mingetty-mono-console.patch
@@ -1,7 +1,7 @@

[packages/util-linux] - build and package API docs

2021-05-09 Thread hawk

commit f7f13771add2f419732f600e7b93e63a70ba9325
Author: Marcin Krol 
Date:   Sun May 9 17:55:31 2021 +

- build and package API docs

 util-linux.spec | 89 +++--
 1 file changed, 87 insertions(+), 2 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index d173142..b7573ea 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -12,6 +12,7 @@
 # Conditional build:
 %bcond_withuClibc  # link initrd version with static glibc instead 
of uClibc
 %bcond_without dietlibc# link initrd version with dietlibc instead of 
uClibc
+%bcond_without apidocs # API documentation for libraries
 %bcond_without selinux # SELinux support
 %bcond_without su  # su/runuser programs
 %bcond_without systemd # systemd
@@ -40,7 +41,7 @@ Summary(tr.UTF-8):Temel sistem araçları
 Summary(uk.UTF-8): Набір базових системних утиліт для Linux
 Name:  util-linux
 Version:   2.36.2
-Release:   2
+Release:   3
 License:   GPL v2+, GPL v3 (hwclock)
 Group: Applications/System
 # https://github.com/karelzak/util-linux (GitHub backup)
@@ -73,8 +74,10 @@ BuildRequires:   autoconf >= 2.60
 BuildRequires: automake >= 1:1.10
 BuildRequires: gettext-tools >= 0.18.3
 %{?with_fallocate:BuildRequires:   glibc-devel >= 6:2.11}
+%if %{with apidocs}
 BuildRequires: gtk-doc >= 1.10
 BuildRequires: gtk-doc-automake >= 1.10
+%endif
 BuildRequires: libcap-ng-devel
 %ifarch ppc ppc64
 # for lscpu
@@ -480,6 +483,19 @@ dietlibc version.
 Biblioteka do obsługi identyfikacji urządzeń i wydobywania tokenów -
 wersja statyczna dla dietlibc.
 
+%package -n libblkid-apidocs
+Summary:libblkid API documentation
+Summary(pl.UTF-8):  Dokumentacja API libblkid
+Group:  Documentation
+Requires:   gtk-doc-common
+BuildArch:  noarch
+
+%description -n libblkid-apidocs
+libblkid API documentation.
+
+%description -n libblkid-apidocs -l pl.UTF-8
+Dokumentacja API libblkid.
+
 %package -n libuuid
 Summary:   Library for accessing and manipulating UUID
 Summary(pl.UTF-8): Biblioteka umożliwiająca dostęp i zmiany UUID
@@ -609,6 +625,19 @@ Static version of fdisk library.
 %description -n libfdisk-static -l pl.UTF-8
 Statyczna wersja biblioteki fdisk.
 
+%package -n libfdisk-apidocs
+Summary:libfdisk API documentation
+Summary(pl.UTF-8):  Dokumentacja API libfdisk
+Group:  Documentation
+Requires:   gtk-doc-common
+BuildArch:  noarch
+
+%description -n libfdisk-apidocs
+libfdisk API documentation.
+
+%description -n libfdisk-apidocs -l pl.UTF-8
+Dokumentacja API libfdisk.
+
 %package -n libmount
 Summary:   Library to handle mounting-related tasks
 Summary(pl.UTF-8): Biblioteka obsługująca zadania związane z montowaniem
@@ -649,6 +678,19 @@ Static version of mount library.
 %description -n libmount-static -l pl.UTF-8
 Statyczna wersja biblioteki mount.
 
+%package -n libmount-apidocs
+Summary:libmount API documentation
+Summary(pl.UTF-8):  Dokumentacja API libmount
+Group:  Documentation
+Requires:   gtk-doc-common
+BuildArch:  noarch
+
+%description -n libmount-apidocs
+libmount API documentation.
+
+%description -n libmount-apidocs -l pl.UTF-8
+Dokumentacja API libmount.
+
 %package -n python3-libmount
 Summary:   Python 3.x libmount bindings
 Summary(pl.UTF-8): Wiązania Pythona 3.x do biblioteki libmount
@@ -713,6 +755,19 @@ Static version of smartcols library.
 %description -n libsmartcols-static -l pl.UTF-8
 Statyczna wersja biblioteki smartcols.
 
+%package -n libsmartcols-apidocs
+Summary:libsmartcols API documentation
+Summary(pl.UTF-8):  Dokumentacja API libsmartcols
+Group:  Documentation
+Requires:   gtk-doc-common
+BuildArch:  noarch
+
+%description -n libsmartcols-apidocs
+libsmartcols API documentation.
+
+%description -n libsmartcols-apidocs -l pl.UTF-8
+Dokumentacja API libsmartcols.
+
 %package initrd
 Summary:   blkid - initrd version
 Summary(pl.UTF-8): blkid - wersja dla initrd
@@ -840,6 +895,7 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses 
-DHAVE_LSEEK64_PROTOTYPE
 %configure \
--bindir=/bin \
--sbindir=/sbin \
+   %{?with_apidocs:--docdir=%{_gtkdocdir}} \
%{!?with_fallocate:--disable-fallocate} \
--enable-libmount-support-mtab \
--disable-makeinstall-chown \
@@ -848,6 +904,7 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses 
-DHAVE_LSEEK64_PROTOTYPE
--disable-use-tty-group \
--disable-wall \
--enable-chfn-chsh \
+   %{?with_apidocs:--enable-gtk-doc} \
--enable-kill \
--enable-libblkid \
--enable-line \
@@ -964,8 +1021,12 @@ echo '.so man8/swapon.8' > 
$RPM_BUILD_ROOT%{_mandir}/pl/man8/swapoff.8
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/{cfdisk,sfdisk}.8
 %endif
 
+%if %{with apidocs}
 # examples
-%{__rm}

[packages/perl-dirs] - reverse logic - ABI 5.8.0 for AC and recent one for others

2021-05-09 Thread hawk

commit 594a4ab16b002c96f4f95d1938be777b5413
Author: Marcin Krol 
Date:   Sun May 9 19:49:05 2021 +0200

- reverse logic - ABI 5.8.0 for AC and recent one for others

 perl-dirs.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/perl-dirs.spec b/perl-dirs.spec
index 9d6c747..506a25f 100644
--- a/perl-dirs.spec
+++ b/perl-dirs.spec
@@ -2,10 +2,10 @@
 # Conditional build:
 %bcond_without threads # build without support for threads in Perl
 
-%if "%{pld_release}" == "th"
-%defineabi 5.32.0
-%else
+%if "%{pld_release}" == "ac"
 %defineabi 5.8.0
+%else
+%defineabi 5.32.0
 %endif
 
 %defineperlthread  %{?with_threads:-thread-multi}


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/perl-dirs.git/commitdiff/594a4ab16b002c96f4f95d1938be777b5413

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/kmod] - docs aren't built despite of configure options, make it bcond and disabled by default

2021-05-09 Thread hawk

commit ae89445f0eca5415597a79a8e2a057662239322a
Author: Marcin Krol 
Date:   Sun May 9 15:37:41 2021 +

- docs aren't built despite of configure options, make it bcond and
  disabled by default

 kmod.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/kmod.spec b/kmod.spec
index 1557bf1..5aab23a 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -8,6 +8,7 @@
 %bcond_without openssl # OpenSSL support for PKCS7 signatures in modinfo
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
+%bcond_withdocs# Docs
 %bcond_without tests   # perform "make check" (init_module seems to require 
root for mkdir)
 
 Summary:   Linux kernel module handling
@@ -26,7 +27,7 @@ Patch1:   %{name}-depmod.d-kver.patch
 URL:   https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11
-BuildRequires: gtk-doc >= 1.14
+%{?with_docs:BuildRequires:gtk-doc >= 1.14}
 %if %{with tests}
 BuildRequires: kernel-module-build
 %endif
@@ -162,6 +163,7 @@ cd build
 ../%configure \
--disable-silent-rules \
--disable-test-modules \
+   %{?with_docs:--enable-gtk-doc} \
%{?with_python2:--enable-python} \
%{?with_openssl:--with-openssl} \
--with-rootlibdir=/%{_lib} \


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kmod.git/commitdiff/ae89445f0eca5415597a79a8e2a057662239322a

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[projects/pld-builder.new] - python3 raises error when dictionary is changed during loop

2021-05-09 Thread hawk

commit 129e2f73ba7bf70cc60fa88dbd5fab5cc1820cba
Author: Marcin Krol 
Date:   Sun May 9 14:09:37 2021 +0200

- python3 raises error when dictionary is changed during loop

 PLD_Builder/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index 91a115e..bed6c1d 100644
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -23,7 +23,7 @@ def close_killset(killset):
 return True
 rx = re.compile(r'^.* marks (?P[^\s]+?)-[^-]+-[^-]+\s.*$')
 errors = ""
-for p in k:
+for p in list(k):
 if p in hold:
 del killset[p]
 errors += "cannot remove %s because it's crucial\n" % p


 gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/129e2f73ba7bf70cc60fa88dbd5fab5cc1820cba

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/audit] - allow building without python2, but with python3

2021-05-05 Thread hawk

commit 3c5110f4ff4826ca639735e949c972d837c18af7
Author: Marcin Krol 
Date:   Thu May 6 01:03:19 2021 +0200

- allow building without python2, but with python3

 audit.spec | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/audit.spec b/audit.spec
index 85d1101..122a909 100644
--- a/audit.spec
+++ b/audit.spec
@@ -5,6 +5,7 @@
 %bcond_without golang  # Go language bindings
 %bcond_withgccgo   # use GCC go frontend instead of golang 
implementation
 %bcond_without python  # Python bindings (any)
+%bcond_without python2 # Python 2 bindings
 %bcond_without python3 # Python 3 bindings
 %bcond_without zos_remote  # zos-remote audisp plugin (LDAP dep)
 
@@ -13,6 +14,7 @@
 %endif
 
 %if %{without python}
+%undefine  with_python2
 %undefine  with_python3
 %endif
 Summary:   User space tools for 2.6 kernel auditing
@@ -46,7 +48,7 @@ BuildRequires:libtool
 BuildRequires: libwrap-devel
 BuildRequires: linux-libc-headers >= 7:2.6.30
 %{?with_zos_remote:BuildRequires:  openldap-devel}
-%if %{with python}
+%if %{with python2}
 BuildRequires: python-devel >= 1:2.5
 BuildRequires: rpm-pythonprov
 BuildRequires: swig-python
@@ -252,7 +254,7 @@ ln -sf /%{_lib}/$(basename 
$RPM_BUILD_ROOT/%{_lib}/libauparse.so.*.*.*) \
 # RH initscripts-specific
 %{__rm} -r $RPM_BUILD_ROOT%{_libexecdir}/initscripts
 
-%if %{with python}
+%if %{with python2}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
@@ -409,7 +411,7 @@ fi
 %{_libdir}/golang/src/redhat.com/audit
 %endif
 
-%if %{with python}
+%if %{with python2}
 %files -n python-audit
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_audit.so


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/audit.git/commitdiff/3c5110f4ff4826ca639735e949c972d837c18af7

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/libarchive] - rediffed

2021-05-05 Thread hawk

commit 44d5692cd4d553777ee163b56c974dd389ef0268
Author: Marcin Krol 
Date:   Thu May 6 00:11:22 2021 +0200

- rediffed

 libarchive-man_progname.patch | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/libarchive-man_progname.patch b/libarchive-man_progname.patch
index 828072c..13688b7 100644
--- a/libarchive-man_progname.patch
+++ b/libarchive-man_progname.patch
@@ -1,8 +1,8 @@
-diff -urN libarchive-2.8.4/cpio/bsdcpio.1 libarchive-2.8.4.new//cpio/bsdcpio.1
 libarchive-2.8.4/cpio/bsdcpio.12010-03-07 19:06:15.0 +0100
-+++ libarchive-2.8.4.new//cpio/bsdcpio.1   2010-08-09 16:15:19.662939678 
+0200
+diff -urNp -x '*.orig' libarchive-3.5.1.org/cpio/bsdcpio.1 
libarchive-3.5.1/cpio/bsdcpio.1
+--- libarchive-3.5.1.org/cpio/bsdcpio.12020-12-26 02:29:38.0 
+0100
 libarchive-3.5.1/cpio/bsdcpio.12021-05-06 00:11:13.180635623 +0200
 @@ -28,7 +28,7 @@
- .Dt BSDCPIO 1
+ .Dt CPIO 1
  .Os
  .Sh NAME
 -.Nm cpio
@@ -10,11 +10,11 @@ diff -urN libarchive-2.8.4/cpio/bsdcpio.1 
libarchive-2.8.4.new//cpio/bsdcpio.1
  .Nd copy files to and from archives
  .Sh SYNOPSIS
  .Nm
-diff -urN libarchive-2.8.4/tar/bsdtar.1 libarchive-2.8.4.new//tar/bsdtar.1
 libarchive-2.8.4/tar/bsdtar.1  2010-04-23 22:34:09.0 +0200
-+++ libarchive-2.8.4.new//tar/bsdtar.1 2010-08-09 16:14:59.660443536 +0200
-@@ -28,7 +28,7 @@
- .Dt BSDTAR 1
+diff -urNp -x '*.orig' libarchive-3.5.1.org/tar/bsdtar.1 
libarchive-3.5.1/tar/bsdtar.1
+--- libarchive-3.5.1.org/tar/bsdtar.1  2020-12-26 02:29:38.0 +0100
 libarchive-3.5.1/tar/bsdtar.1  2021-05-06 00:11:13.180635623 +0200
+@@ -29,7 +29,7 @@
+ .Dt TAR 1
  .Os
  .Sh NAME
 -.Nm tar


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libarchive.git/commitdiff/44d5692cd4d553777ee163b56c974dd389ef0268

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/wget] - rediffed

2021-05-05 Thread hawk

commit 2dc25f2d30921df3e823887e44ff69ffaf7414d3
Author: Marcin Krol 
Date:   Thu May 6 00:08:06 2021 +0200

- rediffed

 user.xdg.origin.url.patch | 66 ++-
 wget-home_etc.patch   | 13 +-
 wget-info.patch   | 10 +++
 wget-wgetrc_path.patch| 42 +++---
 4 files changed, 51 insertions(+), 80 deletions(-)
---
diff --git a/user.xdg.origin.url.patch b/user.xdg.origin.url.patch
index 0cacc5b..976e93b 100644
--- a/user.xdg.origin.url.patch
+++ b/user.xdg.origin.url.patch
@@ -13,11 +13,10 @@ Subject: [PATCH] Set the 'user.xdg.origin.url' xattr for 
downloaded files
  src/url.h  |  4 
  4 files changed, 28 insertions(+)
 
-diff --git a/src/ftp.c b/src/ftp.c
-index 1902242..eeffd88 100644
 a/src/ftp.c
-+++ b/src/ftp.c
-@@ -1299,6 +1299,8 @@ Error in server response, closing control 
connection.\n"));
+diff -urNp -x '*.orig' wget-1.21.1.org/src/ftp.c wget-1.21.1/src/ftp.c
+--- wget-1.21.1.org/src/ftp.c  2021-01-08 23:51:43.0 +0100
 wget-1.21.1/src/ftp.c  2021-05-06 00:07:54.231635623 +0200
+@@ -1534,6 +1534,8 @@ Error in server response, closing contro
else
  fp = output_stream;
  
@@ -26,24 +25,22 @@ index 1902242..eeffd88 100644
if (passed_expected_bytes)
  {
print_length (passed_expected_bytes, restval, true);
-diff --git a/src/http.c b/src/http.c
-index 53c9818..c99c417 100644
 a/src/http.c
-+++ b/src/http.c
-@@ -3123,6 +3123,8 @@ read_header:
-   return err;
+diff -urNp -x '*.orig' wget-1.21.1.org/src/http.c wget-1.21.1/src/http.c
+--- wget-1.21.1.org/src/http.c 2021-01-08 23:51:43.0 +0100
 wget-1.21.1/src/http.c 2021-05-06 00:07:54.232635623 +0200
+@@ -4181,6 +4181,8 @@ gethttp (const struct url *u, struct url
  }
+ #endif
  
 +  set_xa (u, fileno(fp));
 +
err = read_response_body (hs, sock, fp, contlen, contrange,
  chunked_transfer_encoding,
  u->url, warc_timestamp_str,
-diff --git a/src/url.c b/src/url.c
-index df63e1c..b41d5ac 100644
 a/src/url.c
-+++ b/src/url.c
-@@ -37,6 +37,7 @@ as that of the covered work.  */
+diff -urNp -x '*.orig' wget-1.21.1.org/src/url.c wget-1.21.1/src/url.c
+--- wget-1.21.1.org/src/url.c  2021-01-08 23:51:43.0 +0100
 wget-1.21.1/src/url.c  2021-05-06 00:07:54.233635623 +0200
+@@ -36,6 +36,7 @@ as that of the covered work.  */
  #include 
  #include 
  #include 
@@ -51,7 +48,7 @@ index df63e1c..b41d5ac 100644
  
  #include "utils.h"
  #include "url.h"
-@@ -2200,6 +2201,25 @@ are_urls_equal (const char *u1, const char *u2)
+@@ -2382,6 +2383,25 @@ are_urls_equal (const char *u1, const ch
return (*p == 0 && *q == 0 ? true : false);
  }
  
@@ -65,7 +62,7 @@ index df63e1c..b41d5ac 100644
 +  res = fsetxattr(fd, XA_ORIGIN, url, strlen(url), 0);
 +  if (res != 0)
 +{
-+  if (errno == ENOTSUP)
++  if (errno == ENOTSUP || errno == EPERM)
 +res = 0;
 +  else
 +logprintf (LOG_NOTQUIET, "fsetxattr: %s\n", strerror (errno));
@@ -77,11 +74,10 @@ index df63e1c..b41d5ac 100644
  #ifdef TESTING
  /* Debugging and testing support for path_simplify. */
  
-diff --git a/src/url.h b/src/url.h
-index b1c46c1..72234e9 100644
 a/src/url.h
-+++ b/src/url.h
-@@ -132,4 +132,8 @@ bool schemes_are_similar_p (enum url_scheme a, enum 
url_scheme b);
+diff -urNp -x '*.orig' wget-1.21.1.org/src/url.h wget-1.21.1/src/url.h
+--- wget-1.21.1.org/src/url.h  2021-01-08 23:51:43.0 +0100
 wget-1.21.1/src/url.h  2021-05-06 00:07:54.233635623 +0200
+@@ -133,4 +133,8 @@ bool schemes_are_similar_p (enum url_sch
  
  bool are_urls_equal (const char *u1, const char *u2);
  
@@ -90,27 +86,3 @@ index b1c46c1..72234e9 100644
 +int set_xa (const struct url *, int);
 +
  #endif /* URL_H */
--- 
-2.3.3
-
-
-commit 8a15b84d4be480514c650db1a34cbb2122d6590d
-Author: Mantas Mikulėnas 
-Date:   Tue Jun 30 14:56:59 2015 +0300
-
-Ignore 'Operation not permitted' when writing to /dev/null
-
-diff --git a/src/url.c b/src/url.c
-index 30cb86f..cff8683 100644
 a/src/url.c
-+++ b/src/url.c
-@@ -2242,7 +2242,7 @@ set_xa (const struct url *origin, int fd)
-   res = fsetxattr(fd, XA_ORIGIN, url, strlen(url), 0);
-   if (res != 0)
- {
--  if (errno == ENOTSUP)
-+  if (errno == ENOTSUP || errno == EPERM)
- res = 0;
-   else
- logprintf (LOG_NOTQUIET, "fsetxattr: %s\n", strerror (errno));
-
diff --git a/wget-home_etc.patch b/wget-home_etc.patch
index 9e45903..b6f5073 100644
--- a/wget-home_etc.patch
+++ b/wget-home_etc.patch
@@ -1,12 +1,11 @@
-diff -Nru wget-1.8.2.orig/src/init.c wget-1.8.2/src/init.c
 wget-1.8.2.orig/src/init.c Sat Mar  1 12:06:06 2003
-+++ wget-1.8.2/src/init.c  Mon Nov  3 10:31:43 2003
-@@ -354,6 +354,7 @@
-   static char buf[PATH_MAX];
-   static char *home;
+diff -urNp -x '*.orig' wget-1.21.1.org/src/init.c wget-1.21.1/src/init.c
+--- wget-1.21.1.org/src/init.c 2021-01-08

[packages/elfutils] - rediffed

2021-05-05 Thread hawk

commit 8c7040e4c3ab08b2884a41611beb7b15c6de4ce3
Author: Marcin Krol 
Date:   Wed May 5 21:02:55 2021 +0200

- rediffed

 elfutils-paxflags.patch | 51 ++---
 x32.patch   | 17 +
 2 files changed, 36 insertions(+), 32 deletions(-)
---
diff --git a/elfutils-paxflags.patch b/elfutils-paxflags.patch
index de557f2..c2e17fa 100644
--- a/elfutils-paxflags.patch
+++ b/elfutils-paxflags.patch
@@ -1,27 +1,7 @@
 elfutils-0.179/src/elflint.c.orig  2020-04-30 19:57:32.691481687 +0200
-+++ elfutils-0.179/src/elflint.c   2020-04-30 19:58:43.287765900 +0200
-@@ -4493,7 +4493,7 @@
- 
-   if (phdr->p_type >= PT_NUM && phdr->p_type != PT_GNU_EH_FRAME
- && phdr->p_type != PT_GNU_STACK && phdr->p_type != PT_GNU_RELRO
--&& phdr->p_type != PT_GNU_PROPERTY
-+&& phdr->p_type != PT_GNU_PROPERTY && phdr->p_type != PT_PAX_FLAGS
- /* Check for a known machine-specific type.  */
- && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL)
-   ERROR (gettext ("\
 elfutils-0.181/libelf/elf.h.orig   2020-10-16 19:17:55.185201231 +0200
-+++ elfutils-0.181/libelf/elf.h2020-10-16 19:19:57.797870314 +0200
-@@ -722,6 +722,7 @@
- #define PT_GNU_STACK  0x6474e551  /* Indicates stack executability */
- #define PT_GNU_RELRO  0x6474e552  /* Read-only after relocation */
- #define PT_GNU_PROPERTY   0x6474e553  /* GNU property */
-+#define PT_PAX_FLAGS  0x65041580  /* PaX flags */
- #define PT_LOSUNW 0x6ffa
- #define PT_SUNWBSS0x6ffa  /* Sun Specific segment */
- #define PT_SUNWSTACK  0x6ffb  /* Stack segment */
 elfutils-0.179/libebl/eblsegmenttypename.c.orig2020-04-30 
19:57:32.728148155 +0200
-+++ elfutils-0.179/libebl/eblsegmenttypename.c 2020-04-30 19:59:30.120845517 
+0200
-@@ -71,6 +71,8 @@
+diff -urNp -x '*.orig' elfutils-0.183.org/libebl/eblsegmenttypename.c 
elfutils-0.183/libebl/eblsegmenttypename.c
+--- elfutils-0.183.org/libebl/eblsegmenttypename.c 2021-02-07 
18:54:39.0 +0100
 elfutils-0.183/libebl/eblsegmenttypename.c 2021-05-05 21:02:25.910006052 
+0200
+@@ -67,6 +67,8 @@ ebl_segment_type_name (Ebl *ebl, int seg
res = "GNU_RELRO";
else if (segment == PT_GNU_PROPERTY)
res = "GNU_PROPERTY";
@@ -30,3 +10,26 @@
else if (segment == PT_SUNWBSS)
res = "SUNWBSS";
else if (segment == PT_SUNWSTACK)
+diff -urNp -x '*.orig' elfutils-0.183.org/libelf/elf.h 
elfutils-0.183/libelf/elf.h
+--- elfutils-0.183.org/libelf/elf.h2021-02-07 18:54:39.0 +0100
 elfutils-0.183/libelf/elf.h2021-05-05 21:02:25.910006052 +0200
+@@ -719,6 +719,7 @@ typedef struct
+ #define PT_GNU_STACK  0x6474e551  /* Indicates stack executability */
+ #define PT_GNU_RELRO  0x6474e552  /* Read-only after relocation */
+ #define PT_GNU_PROPERTY   0x6474e553  /* GNU property */
++#define PT_PAX_FLAGS  0x65041580  /* PaX flags */
+ #define PT_LOSUNW 0x6ffa
+ #define PT_SUNWBSS0x6ffa  /* Sun Specific segment */
+ #define PT_SUNWSTACK  0x6ffb  /* Stack segment */
+diff -urNp -x '*.orig' elfutils-0.183.org/src/elflint.c 
elfutils-0.183/src/elflint.c
+--- elfutils-0.183.org/src/elflint.c   2021-02-07 18:54:39.0 +0100
 elfutils-0.183/src/elflint.c   2021-05-05 21:02:25.909005552 +0200
+@@ -4510,7 +4510,7 @@ only executables, shared objects, and co
+ 
+   if (phdr->p_type >= PT_NUM && phdr->p_type != PT_GNU_EH_FRAME
+ && phdr->p_type != PT_GNU_STACK && phdr->p_type != PT_GNU_RELRO
+-&& phdr->p_type != PT_GNU_PROPERTY
++&& phdr->p_type != PT_GNU_PROPERTY && phdr->p_type != PT_PAX_FLAGS
+ /* Check for a known machine-specific type.  */
+ && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL)
+   ERROR (_("\
diff --git a/x32.patch b/x32.patch
index 7212b9e..4ad8fce 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,6 +1,7 @@
 elfutils-0.181/debuginfod/debuginfod-client.c.orig 2020-09-08 
13:45:06.0 +0200
-+++ elfutils-0.181/debuginfod/debuginfod-client.c  2020-10-16 
19:21:30.944032365 +0200
-@@ -222,7 +222,11 @@
+diff -urNp -x '*.orig' elfutils-0.183.org/debuginfod/debuginfod-client.c 
elfutils-0.183/debuginfod/debuginfod-client.c
+--- elfutils-0.183.org/debuginfod/debuginfod-client.c  2021-02-07 
18:54:39.0 +0100
 elfutils-0.183/debuginfod/debuginfod-client.c  2021-05-05 
21:02:38.910503052 +0200
+@@ -229,7 +229,11 @@ debuginfod_init_cache (char *cache_path,
if (fd < 0)
  return -errno;
  
@@ -12,8 +13,8 @@
  return -errno;
  
/* init max age config file.  */
-@@ -230,7 +234,11 @@
-   && (fd = open(maxage_path, O_CREAT | O_RDWR, 0666)) < 0)
+@@ -237,7 +241,11 @@ debuginfod_init_cache (char *cache_path,
+   && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0)
  return -errno;
  
 +#if defined(__x86_64__) && defined(__ILP32__)

[packages/mpfr] - rediffed

2021-05-05 Thread hawk

commit bddd55029af406007cc879b8d753bda2768e2fb7
Author: Marcin Krol 
Date:   Wed May 5 20:43:45 2021 +0200

- rediffed

 mpfr-info.patch | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/mpfr-info.patch b/mpfr-info.patch
index abed15b..0181855 100644
--- a/mpfr-info.patch
+++ b/mpfr-info.patch
@@ -1,8 +1,9 @@
 mpfr-3.1.0/doc/mpfr.texi.orig  2005-09-16 12:55:55.0 +0200
-+++ mpfr-3.1.0/doc/mpfr.texi   2006-04-23 20:49:04.601985250 +0200
-@@ -38,9 +38,9 @@
- @c  UPDATED-MONTH.
- 
+diff -urNp -x '*.orig' mpfr-4.1.0.org/doc/mpfr.texi mpfr-4.1.0/doc/mpfr.texi
+--- mpfr-4.1.0.org/doc/mpfr.texi   2020-07-10 13:52:33.0 +0200
 mpfr-4.1.0/doc/mpfr.texi   2021-05-05 20:42:44.071571028 +0200
+@@ -32,9 +32,9 @@ with no Front-Cover Texts, and with no B
+ license is included in @ref{GNU Free Documentation License}.
+ @end copying
  
 -@dircategory Software libraries
 +@dircategory Libraries


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mpfr.git/commitdiff/bddd55029af406007cc879b8d753bda2768e2fb7

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/chkconfig] - updated to 1.15, updated URLs

2021-05-04 Thread hawk

commit 6a99f3664bc0759ffd8835ca761b29c5cd0fb512
Author: Marcin Krol 
Date:   Tue May 4 20:40:09 2021 +0200

- updated to 1.15, updated URLs

 chkconfig-add.patch  |  66 ++--
 chkconfig-noxinet.patch  | 805 ---
 chkconfig-optflags.patch |  58 +---
 chkconfig-pl.patch   |  13 +-
 chkconfig-rc.d.patch |   7 +-
 chkconfig.spec   |  12 +-
 6 files changed, 474 insertions(+), 487 deletions(-)
---
diff --git a/chkconfig.spec b/chkconfig.spec
index f92f685..c54cc83 100644
--- a/chkconfig.spec
+++ b/chkconfig.spec
@@ -9,19 +9,19 @@ Summary(ru.UTF-8):Системная утилита для управления
 Summary(tr.UTF-8): Sistem servis bilgilerini sorgular ve yeniler
 Summary(uk.UTF-8): Системна утиліта для керування ієрархією /etc/rc.d
 Name:  chkconfig
-Version:   1.6
+Version:   1.15
 Release:   1
 Epoch: 2
 License:   GPL v2
 Group: Applications/System
-Source0:   
https://fedorahosted.org/releases/c/h/chkconfig/%{name}-%{version}.tar.bz2
-# Source0-md5: e5c03e31ddadc3cdcddd8969345b00c0
+Source0:   
https://github.com/fedora-sysv/chkconfig/archive/refs/tags/%{version}.tar.gz
+# Source0-md5: 36c438a0fa5d95125dbe1093aa2b904c
 Patch0:%{name}-add.patch
 Patch1:%{name}-noxinet.patch
 Patch2:%{name}-rc.d.patch
 Patch3:%{name}-optflags.patch
 Patch4:%{name}-pl.patch
-URL:   https://git.fedorahosted.org/git/chkconfig.git
+URL:   https://github.com/fedora-sysv/chkconfig
 BuildRequires: gettext-tools
 BuildRequires: libselinux-devel
 BuildRequires: newt-devel
@@ -166,7 +166,7 @@ Perla; ma być zamiennikiem skryptu update-alternatives z 
Debiana.
CC="%{__cc}" \
OPTFLAGS="%{rpmcppflags} %{rpmcflags}" \
OPTLDFLAGS="%{rpmldflags}" \
-   SYSTEMDDIR=/lib/systemd
+   SYSTEMDUTILDIR=/lib/systemd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -174,7 +174,7 @@ install -d 
$RPM_BUILD_ROOT{/etc/{rc.d/{init,rc{0,1,2,3,4,5,6}}.d,env.d},/sbin}
 
 %{__make} install \
MANDIR=%{_mandir} \
-   SYSTEMDDIR=/lib/systemd \
+   SYSTEMDUTILDIR=/lib/systemd \
DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/bal
diff --git a/chkconfig-add.patch b/chkconfig-add.patch
index cedbb04..b8249ca 100644
--- a/chkconfig-add.patch
+++ b/chkconfig-add.patch
@@ -1,45 +1,47 @@
 chkconfig-1.3.58/chkconfig.c~  2012-12-04 15:41:14.0 +0200
-+++ chkconfig-1.3.58/chkconfig.c   2012-12-04 15:42:06.080488828 +0200
-@@ -27,6 +27,7 @@
+diff -urNpa chkconfig-1.15.orig/chkconfig.c chkconfig-1.15/chkconfig.c
+--- chkconfig-1.15.orig/chkconfig.c2021-01-21 09:19:06.0 +0100
 chkconfig-1.15/chkconfig.c 2021-05-03 16:44:13.175185842 +0200
+@@ -29,6 +29,7 @@
  #include 
  
  static char *progname;
 +extern int addItem;
  
- #define _(String) gettext((String)) 
+ #define _(String) gettext((String))
  
-@@ -243,12 +244,10 @@
-   frobDependencies();
- else
- for (i = 0; i < 7; i++) {
--  if (!isConfigured(name, i, NULL, NULL)) {
-   if ((1 << i) & s.levels)
-   doSetService(s, i, 1);
-   else
-   doSetService(s, i, 0);
--  }
- }
+@@ -347,12 +348,10 @@ static int addService(char *name, int ty
+ rc = frobDependencies();
+ } else
+ for (i = 0; i < 7; i++) {
+-if (!isConfigured(name, i, NULL, NULL)) {
+ if ((1 << i) & s.levels)
+ doSetService(s, i, 1);
+ else
+ doSetService(s, i, 0);
+-}
+ }
  
- return 0;
-@@ -626,7 +626,7 @@
+ return rc;
+@@ -690,7 +689,7 @@ void forwardSystemd(const char *name, in
  }
  
- int main(int argc, const char ** argv) {
--int listItem = 0, addItem = 0, delItem = 0, overrideItem = 0, 
noRedirectItem = 0;
-+int listItem = 0, delItem = 0, overrideItem = 0, noRedirectItem = 0;
+ int main(int argc, const char **argv) {
+-int listItem = 0, addItem = 0, delItem = 0, overrideItem = 0,
++int listItem = 0, delItem = 0, overrideItem = 0,
+ noRedirectItem = 0;
  int type = TYPE_ANY;
  int rc, i, x;
- char * levels = NULL;
 chkconfig-1.4/leveldb.c~   2015-04-25 12:18:41.0 +0300
-+++ chkconfig-1.4/leveldb.c2015-04-25 12:19:52.959858162 +0300
-@@ -22,6 +22,7 @@
- #include 
- #include 
+diff -urNpa chkconfig-1.15.orig/leveldb.c chkconfig-1.15/leveldb.c
+--- chkconfig-1.15.orig/leveldb.c  2021-01-21 09:19:06.0 +0100
 chkconfig-1.15/leveldb.c   2021-05-03 16:40:14.588185842 +0200
+@@ -28,6 +28,7 @@
+ #include 
+ #include 
  #include 
 +#include 
  #include 
- #include 
- #include 
+ #include 
+ 
 @@ -41,6 +42,8 @@
  
  #include "leveldb.h"
@@ -47,10 +49,10 @@
 +int addItem = 0;
 +
  int selinux_restore(const char *name) {
- struct selabel_handle *hnd = NULL;
- struct stat buf;
-@@ -563,6

DISTFILES: chkconfig: 1.15.tar.gz

2021-05-04 Thread hawk

Request by: hawk


Files fetched: 1

STORED: https://github.com/fedora-sysv/chkconfig/archive/refs/tags/1.15.tar.gz
36c438a0fa5d95125dbe1093aa2b904c  1.15.tar.gz
Size: 182781 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

[projects/pld-builder.new] - more python 3.x fixes, can't test on PLD but TLD version works fine

2021-05-03 Thread hawk

commit 22ca9cb4886dac3daceaab5ebac185b639e0e874
Author: Marcin Krol 
Date:   Mon May 3 11:49:50 2021 +0200

- more python 3.x fixes, can't test on PLD but TLD version works fine

 PLD_Builder/bqueue.py  |  2 +-
 PLD_Builder/chroot.py  | 54 ++
 PLD_Builder/file_sender.py | 15 ++--
 PLD_Builder/install.py | 12 +-
 PLD_Builder/load_balancer.py   |  2 +-
 PLD_Builder/mailer.py  |  6 ++---
 PLD_Builder/maintainer.py  |  2 +-
 PLD_Builder/request.py |  2 +-
 PLD_Builder/request_fetcher.py | 18 +++---
 PLD_Builder/request_handler.py |  3 ---
 PLD_Builder/rpm_builder.py | 31 +---
 PLD_Builder/srpm_builder.py|  7 ++
 PLD_Builder/util.py| 12 +++---
 13 files changed, 69 insertions(+), 97 deletions(-)
---
diff --git a/PLD_Builder/bqueue.py b/PLD_Builder/bqueue.py
index 4699fd7..e33483e 100644
--- a/PLD_Builder/bqueue.py
+++ b/PLD_Builder/bqueue.py
@@ -133,7 +133,7 @@ class B_Queue:
 sio.seek(0)
 (fdno, tmpname) = tempfile.mkstemp(dir=os.path.dirname(name))
 f = os.fdopen(fdno, "w")
-util.sendfile(sio, f)
+shutil.copyfileobj(sio, f)
 f.flush()
 os.fsync(f.fileno())
 f.close()
diff --git a/PLD_Builder/chroot.py b/PLD_Builder/chroot.py
index 8acd58d..6e7976a 100644
--- a/PLD_Builder/chroot.py
+++ b/PLD_Builder/chroot.py
@@ -4,11 +4,8 @@ import os
 import re
 import random
 import util
-
-try:
-from hashlib import md5 as md5
-except ImportError:
-from md5 import md5
+import shutil
+import subprocess
 
 from config import config
 
@@ -27,8 +24,13 @@ def command_sh(cmd):
 return "%s sudo chroot %s /bin/sh -c \"export LC_ALL=C; exec < /dev/null; 
%s\"" \
 % (config.sudo_chroot_wrapper, config.chroot, quote(cmd))
 
-def popen(cmd, user = "builder", mode = "r"):
-f = os.popen(command(cmd, user), mode)
+def popen(cmd, user = "builder", mode = "r", encoding = None):
+if mode == "r":
+p = subprocess.Popen(command(cmd, user), shell=True, 
stdout=subprocess.PIPE, close_fds=True, encoding=encoding)
+f = p.stdout
+else:
+p = subprocess.Popen(command(cmd, user), shell=True, 
stdin=subprocess.PIPE, close_fds=True, encoding=encoding)
+f = p.stdin
 return f
 
 def run(cmd, user = "builder", logfile = None, logstdout = None):
@@ -49,36 +51,16 @@ def run(cmd, user = "builder", logfile = None, logstdout = 
None):
 return r
 
 def cp(file, outfile, user="builder", rm=False):
-m = md5()
-m.update(util.to_bytes(str(random.sample(range(10), 500
-digest = m.hexdigest()
-
-marker_start = "--- FILE BEGIN DIGEST %s ---" % digest
-marker_end = "--- FILE END DIGEST %s ---" % digest
-
-f = open(outfile, 'wb')
-cmd = "echo \"%s\"; cat %s; echo \"%s\"" % (marker_start, file, marker_end)
+f_out = open(outfile, 'wb')
+cmd = "cat %s" % file
 if rm:
 cmd += "; rm %s" % file
-c = command(cmd, user)
-p = os.popen(c)
-# get file contents
-marker = False
-for l in p:
-if not marker and l.strip() == marker_start:
-marker = True
-continue
-me = l.find(marker_end)
-if me != -1:
-l = l[:me]
-f.write(util.to_bytes(l))
-marker = False
-break
-if marker:
-f.write(util.to_bytes(l))
-rp = p.close()
-rf = f.close()
-if rp == None:
+p = subprocess.Popen(command(cmd, user), shell=True, 
stdout=subprocess.PIPE, close_fds=True)
+f_in = p.stdout
+shutil.copyfileobj(f_in, f_out)
+f_out.close()
+r = f_in.close()
+if r == None:
 return 0
 else:
-return rp
+return r
diff --git a/PLD_Builder/file_sender.py b/PLD_Builder/file_sender.py
index c6cc459..3ebf240 100644
--- a/PLD_Builder/file_sender.py
+++ b/PLD_Builder/file_sender.py
@@ -8,8 +8,7 @@ import time
 import shutil
 import sys
 import traceback
-import urllib2
-
+import urllib.request
 from config import config, init_conf
 import mailer
 import path
@@ -94,11 +93,11 @@ def post_file(src, url):
 global problems
 try:
 f = open(src, 'r')
-data = f.read()
+data = f.read().encode('utf-8')
 f.close()
-req = urllib2.Request(url, data)
-req.add_header('X-Filename', os.path.basename(src))
-f = urllib2.urlopen(req)
+headers = { 'X-Filename' : os.path.basename(src) }
+req = urllib.request.Request(url, data=data, headers=headers)
+f = urllib.request.urlopen(req)
 f.close()
 except Exception as e:
 problems[src] = e
@@ -164,9 +163,9 @@ def flush_queue(dir):
 d = read_name_val(f)
 if d != None: q.append(d)
 def mycmp(x, y):
-rc = cmp(x['Time'], y['Time'])
+rc = util.cmp(x['Time'], y['Time'])
 if rc == 0 and 'Type' in x and 'Type' in

[projects/pld-builder.new] - more python 3.x fixes, dropped python 2.x support

2021-05-02 Thread hawk

commit 14edabbea8736bc0421d4bfeeda6bcca7501669c
Author: Marcin Krol 
Date:   Sun May 2 13:52:06 2021 +0200

- more python 3.x fixes, dropped python 2.x support

 PLD_Builder/acl.py |  5 +
 PLD_Builder/bqueue.py  | 29 -
 PLD_Builder/chroot.py  |  7 ---
 PLD_Builder/config.py  |  5 +
 PLD_Builder/gpg.py | 18 +++---
 PLD_Builder/install.py |  6 +-
 PLD_Builder/mailer.py  |  6 +-
 PLD_Builder/notify.py  |  8 ++--
 PLD_Builder/pipeutil.py|  5 +
 PLD_Builder/request.py | 12 ++--
 PLD_Builder/request_fetcher.py |  6 +-
 PLD_Builder/request_handler.py |  5 -
 PLD_Builder/rpm_builder.py |  4 ++--
 PLD_Builder/srpm_builder.py|  4 
 PLD_Builder/util.py| 17 +
 PLD_Builder/wrap.py|  5 +
 16 files changed, 61 insertions(+), 81 deletions(-)
---
diff --git a/PLD_Builder/acl.py b/PLD_Builder/acl.py
index 0d45634..88ed536 100644
--- a/PLD_Builder/acl.py
+++ b/PLD_Builder/acl.py
@@ -1,10 +1,7 @@
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
 import sys
-if sys.version_info[0] == 2:
-import ConfigParser
-else:
-import configparser as ConfigParser
+import configparser as ConfigParser
 import string
 import fnmatch
 import os
diff --git a/PLD_Builder/bqueue.py b/PLD_Builder/bqueue.py
index aaa249c..4699fd7 100644
--- a/PLD_Builder/bqueue.py
+++ b/PLD_Builder/bqueue.py
@@ -4,14 +4,12 @@ import re
 import gzip
 import time
 import sys
-if sys.version_info[0] == 2:
-import StringIO
-else:
-from io import StringIO
+from io import StringIO
 import os
 import fcntl
 import string
 import tempfile
+import shutil
 
 # PLD_Builder:
 import gpg
@@ -131,21 +129,26 @@ class B_Queue:
 sio = StringIO()
 self._write_to(sio)
 sio.seek(0)
-sio.write(gpg.sign(sio.read()))
+sio.write(util.to_str(gpg.sign(sio.read(
 sio.seek(0)
 (fdno, tmpname) = tempfile.mkstemp(dir=os.path.dirname(name))
 f = os.fdopen(fdno, "w")
-if re.search(r"\.gz$", name):
-fgz = gzip.GzipFile(filename=name, mode="w", compresslevel=6, 
fileobj=f)
-util.sendfile(sio, fgz)
-fgz.close()
-else:
-util.sendfile(sio, f)
+util.sendfile(sio, f)
 f.flush()
 os.fsync(f.fileno())
 f.close()
-os.chmod(tmpname, 0o0644)
-os.rename(tmpname, name)
+if re.search(r"\.gz$", name):
+f_in = open(tmpname, 'rb')
+f_out = gzip.open(name, 'wb')
+shutil.copyfileobj(f_in, f_out)
+f_in.close();
+f_out.flush();
+os.fsync(f_out.fileno())
+f_out.close();
+os.remove(tmpname)
+else:
+os.rename(tmpname, name)
+os.chmod(name, 0o0644)
 
 def add(self, req):
 self.requests.append(req)
diff --git a/PLD_Builder/chroot.py b/PLD_Builder/chroot.py
index f91e1c6..8acd58d 100644
--- a/PLD_Builder/chroot.py
+++ b/PLD_Builder/chroot.py
@@ -3,6 +3,7 @@
 import os
 import re
 import random
+import util
 
 try:
 from hashlib import md5 as md5
@@ -49,7 +50,7 @@ def run(cmd, user = "builder", logfile = None, logstdout = 
None):
 
 def cp(file, outfile, user="builder", rm=False):
 m = md5()
-m.update(str(random.sample(range(10), 500)).encode('utf-8'))
+m.update(util.to_bytes(str(random.sample(range(10), 500
 digest = m.hexdigest()
 
 marker_start = "--- FILE BEGIN DIGEST %s ---" % digest
@@ -70,11 +71,11 @@ def cp(file, outfile, user="builder", rm=False):
 me = l.find(marker_end)
 if me != -1:
 l = l[:me]
-f.write(l)
+f.write(util.to_bytes(l))
 marker = False
 break
 if marker:
-f.write(l)
+f.write(util.to_bytes(l))
 rp = p.close()
 rf = f.close()
 if rp == None:
diff --git a/PLD_Builder/config.py b/PLD_Builder/config.py
index a325762..d7bd958 100644
--- a/PLD_Builder/config.py
+++ b/PLD_Builder/config.py
@@ -1,10 +1,7 @@
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
 import sys
-if sys.version_info[0] == 2:
-import ConfigParser
-else:
-import configparser as ConfigParser
+import configparser as ConfigParser
 import string
 import os
 import syslog
diff --git a/PLD_Builder/gpg.py b/PLD_Builder/gpg.py
index b820dcd..942cfb5 100644
--- a/PLD_Builder/gpg.py
+++ b/PLD_Builder/gpg.py
@@ -4,11 +4,7 @@ import log
 import subprocess
 import re
 import sys
-if sys.version_info[0] == 2:
-import StringIO
-else:
-from io import StringIO
-
+from io import StringIO
 import util
 import os
 import pipeutil
@@ -27,7 +23,7 @@ def get_keys(buf):
 cmd = ['/usr/bin/gpg', '--batch', '--no-tty', '--decrypt']
 gpg_run = subprocess.Popen(cmd, stdin=subprocess.PIPE, 
stdout=subprocess.PIPE, stderr=subprocess.PIPE,

[projects/pld-builder.new] - ported python parts to python3

2021-05-02 Thread hawk

commit 8880fdd5b98fe093a0ef977a5067d84789d039c9
Author: Marcin Krol 
Date:   Sun May 2 13:51:26 2021 +0200

- ported python parts to python3

 client/make-request.sh | 39 ---
 1 file changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/client/make-request.sh b/client/make-request.sh
index 605d949..e27992a 100755
--- a/client/make-request.sh
+++ b/client/make-request.sh
@@ -101,20 +101,21 @@ send_request() {
;;
*)
msg "Sending using HTTP mode to $url"
-   cat - | python -c '
-import sys, socket, urllib2
+   cat - | python3 -c '
+import sys, socket
+from urllib import request
 
 try:
-data = sys.stdin.read()
+data = sys.stdin.read().encode("utf-8")
 url = sys.argv[1]
 socket.setdefaulttimeout(30)
-req = urllib2.Request(url, data)
-f = urllib2.urlopen(req)
+req = request.Request(url, data=data)
+f = request.urlopen(req)
 f.close()
 except Exception as e:
-print >> sys.stderr, "Problem while sending request via HTTP: %s: %s" 
% (url, e)
+print("Problem while sending request via HTTP: %s: %s" % (url, e), 
file=sys.stderr)
 sys.exit(1)
-print >> sys.stdout, "Request queued via HTTP."
+print("Request queued via HTTP.", file=sys.stdout)
 ' "$url"
;;
esac
@@ -605,36 +606,36 @@ esac
 
 # need to do this after dist selection
 if [ "$skip" ]; then
-   skip=$(skip="$skip" control_url="$control_url" python -c '
-import urllib2
+   skip=$(skip="$skip" control_url="$control_url" python3 -c '
 import sys
-import StringIO
 import gzip
 import re
 import os
 import string
+from urllib import request
+from io import BytesIO
 from xml.dom import minidom
 
 skip = os.environ.get("skip").split(",");
 control_url = os.environ.get("control_url")
 
-print >> sys.stderr, "* Check queue_id-s against %s" % control_url
+print("* Check queue_id-s against %s" % control_url, file=sys.stderr)
 
 try:
headers = { "Cache-Control": "no-cache", "Pragma": "no-cache" }
-   req = urllib2.Request(url=control_url + "/queue.gz", headers=headers)
-   f = urllib2.urlopen(req)
+   req = request.Request(url=control_url + "/queue.gz", headers=headers)
+   f = request.urlopen(req)
 except Exception, e:
-   print >> sys.stderr, "Fetch error %s: %s" % (control_url + "/queue.gz", 
e)
+   print("Fetch error %s: %s" % (control_url + "/queue.gz", e), 
file=sys.stderr)
sys.exit(1)
 
-sio = StringIO.StringIO()
+sio = BytesIO()
 sio.write(f.read())
 f.close()
 sio.seek(0)
 f = gzip.GzipFile(fileobj = sio)
 
-xml = re.compile("(.*?)", re.DOTALL).match(f.read()).group(1)
+xml = re.compile("(.*?)", 
re.DOTALL).match(f.read().decode("utf-8")).group(1)
 d = minidom.parseString(xml)
 
 q = []
@@ -646,13 +647,13 @@ for c in d.documentElement.childNodes:
 err = 0
 for s in skip:
if s not in q:
-   print >> sys.stderr, "- Check %s: ERROR: Not valid queue-id" % s
+   print("- Check %s: ERROR: Not valid queue-id" % s, 
file=sys.stderr)
err = 1
else:
-   print >> sys.stderr, "- Check %s: OK" % s
+   print("- Check %s: OK" % s, file=sys.stderr)
 if err == 1:
sys.exit(1)
-print string.join(skip, ",")
+print(",".join(skip))
 ') || exit $?
f_upgrade=no
build_mode=test


 gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/14edabbea8736bc0421d4bfeeda6bcca7501669c

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[projects/pld-builder.new] - one more fix, still not fully ported to python 3.x

2021-03-22 Thread hawk

commit ccee54c2efc59acafcca2d77ce2499d7df202250
Author: Marcin Krol 
Date:   Tue Mar 23 01:49:57 2021 +0100

- one more fix, still not fully ported to python 3.x

 PLD_Builder/mailer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/PLD_Builder/mailer.py b/PLD_Builder/mailer.py
index 0c6ea27..b7d44ab 100644
--- a/PLD_Builder/mailer.py
+++ b/PLD_Builder/mailer.py
@@ -14,9 +14,9 @@ import log
 
 def recode(s):
 if s.__class__ == ''.__class__:
-return s.decode('iso-8859-1', 'replace').encode('us-ascii', 'replace')
+return s.encode('iso-8859-1', 'replace').decode('us-ascii', 'replace')
 else:
-return s.encode('us-ascii', 'replace')
+return s.decode('us-ascii', 'replace')
 
 class Message:
 def __init__(self):


 gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/ccee54c2efc59acafcca2d77ce2499d7df202250

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[projects/pld-builder.new] - more python 3.x fixes

2021-03-22 Thread hawk

commit 9366870d49b1070aa69bdc484b252a15656d9717
Author: Marcin Krol 
Date:   Mon Mar 22 23:49:23 2021 +0100

- more python 3.x fixes

 PLD_Builder/bqueue.py  |  2 +-
 PLD_Builder/chroot.py  |  2 +-
 PLD_Builder/file_sender.py |  3 ++-
 PLD_Builder/install.py |  2 +-
 PLD_Builder/load_balancer.py   |  3 ++-
 PLD_Builder/mailer.py  |  2 +-
 PLD_Builder/notify.py  |  4 ++--
 PLD_Builder/pipeutil.py|  4 ++--
 PLD_Builder/request_fetcher.py |  2 +-
 PLD_Builder/rpm_builder.py |  2 +-
 PLD_Builder/srpm_builder.py|  2 +-
 PLD_Builder/util.py| 19 +++
 PLD_Builder/wrap.py|  2 +-
 13 files changed, 35 insertions(+), 14 deletions(-)
---
diff --git a/PLD_Builder/bqueue.py b/PLD_Builder/bqueue.py
index 3ab19c3..aaa249c 100644
--- a/PLD_Builder/bqueue.py
+++ b/PLD_Builder/bqueue.py
@@ -128,7 +128,7 @@ class B_Queue:
 fcntl.flock(self.fd, fcntl.LOCK_UN)
 
 def write_signed(self, name):
-sio = StringIO.StringIO()
+sio = StringIO()
 self._write_to(sio)
 sio.seek(0)
 sio.write(gpg.sign(sio.read()))
diff --git a/PLD_Builder/chroot.py b/PLD_Builder/chroot.py
index a489ac3..f91e1c6 100644
--- a/PLD_Builder/chroot.py
+++ b/PLD_Builder/chroot.py
@@ -49,7 +49,7 @@ def run(cmd, user = "builder", logfile = None, logstdout = 
None):
 
 def cp(file, outfile, user="builder", rm=False):
 m = md5()
-m.update(str(random.sample(range(10), 500)))
+m.update(str(random.sample(range(10), 500)).encode('utf-8'))
 digest = m.hexdigest()
 
 marker_start = "--- FILE BEGIN DIGEST %s ---" % digest
diff --git a/PLD_Builder/file_sender.py b/PLD_Builder/file_sender.py
index 933eedf..c6cc459 100644
--- a/PLD_Builder/file_sender.py
+++ b/PLD_Builder/file_sender.py
@@ -17,6 +17,7 @@ import log
 import loop
 import status
 import lock
+import util
 
 retries_times = [5 * 60, 5 * 60, 10 * 60, 10 * 60, 30 * 60, 60 * 60]
 
@@ -168,7 +169,7 @@ def flush_queue(dir):
 return cmp(x['Type'], y['Type'])
 else:
 return rc
-q.sort(mycmp)
+q.sort(key=util.cmp_to_key(mycmp))
 
 error = None
 # copy of q
diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index f6f0719..edb4ae9 100644
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -79,7 +79,7 @@ def upgrade_from_batch(r, b):
 b.log_line("upgrade would need removal of %s" % k)
 return False
 b.log_line("upgrading packages")
-logbuf = StringIO.StringIO()
+logbuf = StringIO()
 res = chroot.run("rpm -Fvh %s" % ' '.join(b.files), user = "root", logfile 
= b.logfile)
 if res != 0:
 b.log_line("package upgrade failed")
diff --git a/PLD_Builder/load_balancer.py b/PLD_Builder/load_balancer.py
index 019c184..43d85d5 100644
--- a/PLD_Builder/load_balancer.py
+++ b/PLD_Builder/load_balancer.py
@@ -10,6 +10,7 @@ import log
 import status
 import lock
 import loop
+import util
 
 import rpm_builder
 
@@ -40,7 +41,7 @@ def builders_order():
 def mycmp(b1, b2):
 return cmp(bs[b1], bs[b2])
 
-bl.sort(mycmp)
+bl.sort(key=util.cmp_to_key(mycmp))
 
 f.seek(0)
 f.truncate(0)
diff --git a/PLD_Builder/mailer.py b/PLD_Builder/mailer.py
index 56a9f14..0c6ea27 100644
--- a/PLD_Builder/mailer.py
+++ b/PLD_Builder/mailer.py
@@ -21,7 +21,7 @@ def recode(s):
 class Message:
 def __init__(self):
 self.headers = {}
-self.body = StringIO.StringIO()
+self.body = StringIO()
 self.set_std_headers()
 
 def set_header(self, n, v):
diff --git a/PLD_Builder/notify.py b/PLD_Builder/notify.py
index ed5df8b..e13c052 100644
--- a/PLD_Builder/notify.py
+++ b/PLD_Builder/notify.py
@@ -14,12 +14,12 @@ from config import config
 
 class Notifier:
 def __init__(self, g):
-self.xml = StringIO.StringIO()
+self.xml = StringIO()
 self.xml.write("\n" % \
 (g.id, config.builder))
 
 def send(self, r):
-sio = StringIO.StringIO()
+sio = StringIO()
 self.xml.write("\n")
 self.xml.seek(0)
 sio.write(gpg.sign(self.xml.read()))
diff --git a/PLD_Builder/pipeutil.py b/PLD_Builder/pipeutil.py
index 9a3ca23..a3e78c9 100644
--- a/PLD_Builder/pipeutil.py
+++ b/PLD_Builder/pipeutil.py
@@ -9,9 +9,9 @@ else:
 from io import StringIO
 
 def rw_pipe(buf_, infd, outfd):
-buf = StringIO.StringIO()
+buf = StringIO()
 buf.write(buf_.read())
-ret = StringIO.StringIO()
+ret = StringIO()
 pos = 0
 rd_fin = 0
 wr_fin = 0
diff --git a/PLD_Builder/request_fetcher.py b/PLD_Builder/request_fetcher.py
index 609ec71..fc9f49d 100644
--- a/PLD_Builder/request_fetcher.py
+++ b/PLD_Builder/request_fetcher.py
@@ -73,7 +73,7 @@ def fetch_queue(control_url):
 signal.alarm(0)
 log.error("can't fetch %s: %s" % (control_url + "/queue.gz", e))
 sys.exit(1)
-sio = StringIO.StringIO()
+

[projects/pld-builder.new] - doh, really fix join()

2021-03-22 Thread hawk

commit 524db80209988c08f56bad1de8708ccd746d000a
Author: Marcin Krol 
Date:   Mon Mar 22 20:27:16 2021 +0100

- doh, really fix join()

 PLD_Builder/build.py   |  2 +-
 PLD_Builder/file_sender.py |  2 +-
 PLD_Builder/install.py |  6 +++---
 PLD_Builder/request.py | 12 ++--
 PLD_Builder/request_handler.py |  2 +-
 PLD_Builder/rpm_builder.py |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/PLD_Builder/build.py b/PLD_Builder/build.py
index fc9534f..fecbf97 100644
--- a/PLD_Builder/build.py
+++ b/PLD_Builder/build.py
@@ -117,4 +117,4 @@ def build_all(r, build_fnc):
 notify.add_batch(batch, "SKIP")
 
 buildlogs.flush()
-chroot.run("rm -f %s" % r.chroot_files.join())
+chroot.run("rm -f %s" % ' '.join(r.chroot_files))
diff --git a/PLD_Builder/file_sender.py b/PLD_Builder/file_sender.py
index 910a54c..933eedf 100644
--- a/PLD_Builder/file_sender.py
+++ b/PLD_Builder/file_sender.py
@@ -197,7 +197,7 @@ def flush_queue(dir):
 emails[d['Requester']] = 1
 e = emails.keys()
 m = mailer.Message()
-m.set_headers(to = e.join(", "),
+m.set_headers(to = ", ".join(e),
   subject = "[%s] builder queue problem" % config.builder)
 m.write("there were problems sending files from queue %s:\n" % dir)
 m.write("problems:\n")
diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index 3f630fd..f6f0719 100644
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -53,7 +53,7 @@ def close_killset(killset):
 return errors
 
 def upgrade_from_batch(r, b):
-f = chroot.popen("rpm --test -F %s 2>&1" % b.files.join(), user = "root")
+f = chroot.popen("rpm --test -F %s 2>&1" % ' '.join(b.files), user = 
"root")
 killset = {}
 rx = re.compile(r' \(installed\) (?P[^\s]+)-[^-]+-[^-]+$')
 for l in f:
@@ -66,7 +66,7 @@ def upgrade_from_batch(r, b):
 util.append_to(b.logfile, err)
 log.notice("cannot upgrade rpms")
 return False
-k = killset.keys().join()
+k = ' '.join(killset.keys())
 if True:
 b.log_line("upgrade requires removal of %s" % k)
 res = chroot.run("rpm -e %s" % k, logfile = b.logfile, user = 
"root")
@@ -80,7 +80,7 @@ def upgrade_from_batch(r, b):
 return False
 b.log_line("upgrading packages")
 logbuf = StringIO.StringIO()
-res = chroot.run("rpm -Fvh %s" % b.files.join(), user = "root", logfile = 
b.logfile)
+res = chroot.run("rpm -Fvh %s" % ' '.join(b.files), user = "root", logfile 
= b.logfile)
 if res != 0:
 b.log_line("package upgrade failed")
 logbuf.close()
diff --git a/PLD_Builder/request.py b/PLD_Builder/request.py
index fa2798f..6c81575 100644
--- a/PLD_Builder/request.py
+++ b/PLD_Builder/request.py
@@ -110,7 +110,7 @@ class Group:
 def dump(self, f):
 f.write("group: %d (id=%s pri=%d)\n" % (self.no, self.id, 
self.priority))
 f.write("  from: %s\n" % self.requester)
-f.write("  flags: %s\n" % self.flags.join())
+f.write("  flags: %s\n" % ' '.join(self.flags))
 f.write("  time: %s\n" % time.asctime(time.localtime(self.time)))
 for b in self.batches:
 b.dump(f)
@@ -148,7 +148,7 @@ class Group:
 'requester': escape(self.requester),
 'priority': self.priority,
 'max_jobs': self.max_jobs,
-'flags': self.flags.join()
+'flags': ' '.join(self.flags)
 })
 f.write("\n")
 for b in self.batches:
@@ -162,7 +162,7 @@ class Group:
  %s
  %d
  %d
- %d\n""" % (self.id, self.no, self.flags.join(),
+ %d\n""" % (self.id, self.no, ' '.join(self.flags),
 escape(self.requester_email), escape(self.requester),
 self.time, self.priority, self.max_jobs))
 for b in self.batches:
@@ -294,7 +294,7 @@ class Batch:
 builders = []
 for b in self.builders:
 builders.append("%s:%s" % (b, self.builders_status[b]))
-f.write("builders: %s\n" % builders.join())
+f.write("builders: %s\n" % ' '.join(builders))
 
 def is_command(self):
 return self.command != ""
@@ -392,7 +392,7 @@ class Batch:
 'tooltip' : cgi.escape(tooltip, True),
 }
 + link_post)
-f.write("%s]\n" % builders.join())
+f.write("%s]\n" % ' '.join(builders))
 
 def rpmbuild_opts(self):
 """
@@ -492,7 +492,7 @@ class Batch:
%s
%s
%s\n""" % (self.b_id,
- list(map(lambda b: b.b_id, self.depends_on)).join(),
+ ' '.join(list(map(lambda b: b.b_id, self.depends_on))),
  escape(self.src_rpm),
  escape(' '.join(self.command_flags)), escape(self.command),
  escape(self.spec),

[projects/pld-builder.new] - more python 3.x fixes

2021-03-22 Thread hawk

commit 1d5814b5a9a6fb553a06f7f9d8a307f01abf1526
Author: Marcin Krol 
Date:   Mon Mar 22 03:19:07 2021 +0100

- more python 3.x fixes

 PLD_Builder/build.py  |  2 +-
 PLD_Builder/file_sender.py|  2 +-
 PLD_Builder/gpg.py| 12 ++--
 PLD_Builder/install.py|  6 +++---
 PLD_Builder/request.py| 12 ++--
 PLD_Builder/request_handler.py|  2 +-
 PLD_Builder/request_handler_server.py |  4 ++--
 PLD_Builder/rpm_builder.py|  2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/PLD_Builder/build.py b/PLD_Builder/build.py
index bf38ff4..fc9534f 100644
--- a/PLD_Builder/build.py
+++ b/PLD_Builder/build.py
@@ -117,4 +117,4 @@ def build_all(r, build_fnc):
 notify.add_batch(batch, "SKIP")
 
 buildlogs.flush()
-chroot.run("rm -f %s" % string.join(r.chroot_files))
+chroot.run("rm -f %s" % r.chroot_files.join())
diff --git a/PLD_Builder/file_sender.py b/PLD_Builder/file_sender.py
index 597f3fc..910a54c 100644
--- a/PLD_Builder/file_sender.py
+++ b/PLD_Builder/file_sender.py
@@ -197,7 +197,7 @@ def flush_queue(dir):
 emails[d['Requester']] = 1
 e = emails.keys()
 m = mailer.Message()
-m.set_headers(to = string.join(e, ", "),
+m.set_headers(to = e.join(", "),
   subject = "[%s] builder queue problem" % config.builder)
 m.write("there were problems sending files from queue %s:\n" % dir)
 m.write("problems:\n")
diff --git a/PLD_Builder/gpg.py b/PLD_Builder/gpg.py
index edb8dff..b820dcd 100644
--- a/PLD_Builder/gpg.py
+++ b/PLD_Builder/gpg.py
@@ -27,7 +27,7 @@ def get_keys(buf):
 cmd = ['/usr/bin/gpg', '--batch', '--no-tty', '--decrypt']
 gpg_run = subprocess.Popen(cmd, stdin=subprocess.PIPE, 
stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
 try:
-d_stdout, d_stderr = gpg_run.communicate(buf.encode('utf-8'))
+d_stdout, d_stderr = gpg_run.communicate(buf.decode().encode('utf-8'))
 except OSError as e:
 log.error("gnupg run, does gpg binary exist? : %s" % e)
 raise
@@ -35,7 +35,7 @@ def get_keys(buf):
 rx = re.compile("^gpg:.*using\s[DR]SA\skey\s(?:ID\s)?(\w+)")
 keys = []
 
-for l in d_stderr.split('\n'):
+for l in d_stderr.decode().split('\n'):
 m = rx.match(l)
 if m:
 keys.append(m.group(1))
@@ -59,14 +59,14 @@ def verify_sig(buf):
 cmd = ['/usr/bin/gpg', '--batch', '--no-tty', '--decrypt']
 gpg_run = subprocess.Popen(cmd, stdin=subprocess.PIPE, 
stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
 try:
-d_stdout, d_stderr = gpg_run.communicate(buf.encode('utf-8'))
+d_stdout, d_stderr = gpg_run.communicate(buf.decode().encode('utf-8'))
 except OSError as e:
 log.error("gnupg run failed, does gpg binary exist? : %s" % e)
 raise
 
 rx = re.compile("^gpg: (Good signature from|aka) 
.*<([^>]+)>")
 emails = []
-for l in d_stderr.split('\n'):
+for l in d_stderr.decode().split('\n'):
 m = rx.match(l)
 if m:
 emails.append(m.group(2))
@@ -85,12 +85,12 @@ def sign(buf):
 # TODO: check for gpg return code!
 gpg_run = subprocess.Popen(cmd, stdin=subprocess.PIPE, 
stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
 try:
-d_stdout, d_stderr = gpg_run.communicate(buf.encode('utf-8'))
+d_stdout, d_stderr = gpg_run.communicate(buf.decode().encode('utf-8'))
 except OSError as e:
 log.error("gnupg signing failed, does gpg binary exist? : %s" % e)
 raise
 
 if len(d_stderr):
-log.error("gpg: %s" % d_stderr)
+log.error("gpg: %s" % d_stderr.decode())
 
 return d_stdout
diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index c5f4ce1..3f630fd 100644
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -53,7 +53,7 @@ def close_killset(killset):
 return errors
 
 def upgrade_from_batch(r, b):
-f = chroot.popen("rpm --test -F %s 2>&1" % string.join(b.files), user = 
"root")
+f = chroot.popen("rpm --test -F %s 2>&1" % b.files.join(), user = "root")
 killset = {}
 rx = re.compile(r' \(installed\) (?P[^\s]+)-[^-]+-[^-]+$')
 for l in f:
@@ -66,7 +66,7 @@ def upgrade_from_batch(r, b):
 util.append_to(b.logfile, err)
 log.notice("cannot upgrade rpms")
 return False
-k = string.join(killset.keys())
+k = killset.keys().join()
 if True:
 b.log_line("upgrade requires removal of %s" % k)
 res = chroot.run("rpm -e %s" % k, logfile = b.logfile, user = 
"root")
@@ -80,7 +80,7 @@ def upgrade_from_batch(r, b):
 return False
 b.log_line("upgrading packages")
 logbuf = StringIO.StringIO()
-res = chroot.run("rpm -Fvh %s" % string.join(b.files), user = "root", 
logfile =

[projects/pld-builder.new] - python 3.x fixes

2021-03-22 Thread hawk

commit 3bdce373f200548402050205b335fda32eb775ec
Author: Marcin Krol 
Date:   Mon Mar 22 01:39:44 2021 +0100

- python 3.x fixes

 PLD_Builder/acl.py| 14 +++---
 PLD_Builder/blacklist.py  |  2 +-
 PLD_Builder/bqueue.py |  8 
 PLD_Builder/config.py | 16 
 PLD_Builder/deps.py   | 24 
 PLD_Builder/file_sender.py| 12 ++--
 PLD_Builder/get_br.py | 14 +++---
 PLD_Builder/gpg.py|  6 +++---
 PLD_Builder/install.py|  4 ++--
 PLD_Builder/load_balancer.py  |  4 ++--
 PLD_Builder/log.py|  2 +-
 PLD_Builder/maintainer.py |  2 +-
 PLD_Builder/poldek.py |  4 ++--
 PLD_Builder/request.py| 20 ++--
 PLD_Builder/request_fetcher.py|  6 +++---
 PLD_Builder/request_handler.py|  2 +-
 PLD_Builder/request_handler_server|  4 ++--
 PLD_Builder/request_handler_server.py |  6 +++---
 PLD_Builder/rpm_builder.py|  2 +-
 PLD_Builder/srpm_builder.py   | 10 +-
 PLD_Builder/util.py   |  4 ++--
 bin/file-sender.sh|  2 +-
 bin/load-balancer.sh  |  2 +-
 bin/maintainer.sh |  2 +-
 bin/request-fetcher.sh|  2 +-
 bin/request-handler.sh|  2 +-
 bin/rpm-builder.sh|  2 +-
 bin/src-builder.sh|  2 +-
 28 files changed, 90 insertions(+), 90 deletions(-)
---
diff --git a/PLD_Builder/acl.py b/PLD_Builder/acl.py
index cf69fe8..0d45634 100644
--- a/PLD_Builder/acl.py
+++ b/PLD_Builder/acl.py
@@ -25,7 +25,7 @@ class User:
 self.change_requester = False
 
 if p.has_option(login, "gpg_emails"):
-self.gpg_emails = string.split(p.get(login, "gpg_emails"))
+self.gpg_emails = p.get(login, "gpg_emails").split()
 else:
 log.panic("acl: [%s] has no gpg_emails" % login)
 
@@ -39,8 +39,8 @@ class User:
 self.change_requester = True
 
 if p.has_option(login, "privs"):
-for p in string.split(p.get(login, "privs")):
-l = string.split(p, ":")
+for p in p.get(login, "privs").split():
+l = p.split(":")
 if len(l) == 2:
 p+=":*"
 if len(l) not in (2,3) or l[0] == "" or l[1] == "":
@@ -113,12 +113,12 @@ class ACL_Conf:
 p.readfp(open(path.acl_conf))
 self.users = {}
 for login in p.sections():
-if self.users.has_key(login):
+if login in self.users:
 log.panic("acl: duplicate login: %s" % login)
 continue
 user = User(p, login)
 for e in user.gpg_emails:
-if self.users.has_key(e):
+if e in self.users:
 log.panic("acl: user email colision %s <-> %s" % \
   (self.users[e].login, login))
 else:
@@ -128,7 +128,7 @@ class ACL_Conf:
 
 def user_by_email(self, ems):
 for e in ems:
-if self.users.has_key(e):
+if e in self.users:
 return self.users[e]
 return None
 
@@ -136,7 +136,7 @@ class ACL_Conf:
 return self.users[l]
 
 def user(self, l):
-if not self.users.has_key(l):
+if not l in self.users:
 log.panic("no such user: %s" % l)
 return self.users[l]
 
diff --git a/PLD_Builder/blacklist.py b/PLD_Builder/blacklist.py
index 40367c2..3f55238 100644
--- a/PLD_Builder/blacklist.py
+++ b/PLD_Builder/blacklist.py
@@ -39,7 +39,7 @@ class Blacklist_File:
 status.pop()
 
 def package(self, p):
-#   log.notice("blacklist check: %s (%d)" % (p, self.blacklist.has_key(p)))
+#   log.notice("blacklist check: %s (%d)" % (p, p in self.blacklist))
 if p in self.blacklist:
 return True
 return False
diff --git a/PLD_Builder/bqueue.py b/PLD_Builder/bqueue.py
index 395e32f..3ab19c3 100644
--- a/PLD_Builder/bqueue.py
+++ b/PLD_Builder/bqueue.py
@@ -35,7 +35,7 @@ class B_Queue:
 f.flush()
 os.fsync(f.fileno())
 f.close()
-os.chmod(tmpfname, 0644)
+os.chmod(tmpfname, 0o0644)
 os.rename(tmpfname, fname)
 
 def dump_html(self, fname):
@@ -66,7 +66,7 @@ class B_Queue:
 f.flush()
 os.fsync(f.fileno())
 f.close()
-os.chmod(tmpfname, 0644)
+os.chmod(tmpfname, 0o0644)
 os.rename(tmpfname, fname)
 
 # read possibly compressed, signed queue
@@ -90,7 +90,7 @@ class B_Queue:
 self._open()
 self.signers = []
 body = self.fd.read()
-if string.strip(body) == "":
+if body.strip() == "":
 # empty file, don't choke
 self.requests =

[packages/libtirpc] - rediffed

2021-03-21 Thread hawk

commit aef6da5256f8bc9cfd2d49aa41821a8a5a11b672
Author: Marcin Krol 
Date:   Sun Mar 21 21:47:42 2021 +0100

- rediffed

 libtirpc-link.patch | 32 +---
 1 file changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/libtirpc-link.patch b/libtirpc-link.patch
index 922cbe3..802f228 100644
--- a/libtirpc-link.patch
+++ b/libtirpc-link.patch
@@ -1,6 +1,17 @@
 libtirpc-1.2.6/src/Makefile.am.orig2020-08-18 17:58:23.751237296 
+0200
-+++ libtirpc-1.2.6/src/Makefile.am 2020-08-18 18:18:31.174696123 +0200
-@@ -12,8 +12,9 @@
+diff -urNp -x '*.orig' libtirpc-1.3.1.org/libtirpc.pc.in 
libtirpc-1.3.1/libtirpc.pc.in
+--- libtirpc-1.3.1.org/libtirpc.pc.in  2020-12-01 16:06:57.0 +0100
 libtirpc-1.3.1/libtirpc.pc.in  2021-03-21 21:46:55.788370390 +0100
+@@ -8,5 +8,5 @@ Description: Transport Independent RPC L
+ Requires:
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -ltirpc
+-Libs.private: -lpthread
++Libs.private: -lpthread @GSSAPI_LIBS@
+ Cflags: -I${includedir}/tirpc
+diff -urNp -x '*.orig' libtirpc-1.3.1.org/src/Makefile.am 
libtirpc-1.3.1/src/Makefile.am
+--- libtirpc-1.3.1.org/src/Makefile.am 2020-12-01 16:06:57.0 +0100
 libtirpc-1.3.1/src/Makefile.am 2021-03-21 21:46:55.788370390 +0100
+@@ -12,8 +12,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/tirpc -inc
  
  lib_LTLIBRARIES = libtirpc.la
  
@@ -9,9 +20,9 @@
  libtirpc_la_LDFLAGS += -version-info @LT_VERSION_INFO@
 +libtirpc_la_LIBADD = -lpthread
  
- libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c 
clnt_bcast.c \
- clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
-@@ -42,7 +42,7 @@
+ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \
+ binddynport.c bindresvport.c \
+@@ -41,7 +42,7 @@ endif
  if GSS
  libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c \
   rpc_gss_utils.c
@@ -20,12 +31,3 @@
  libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
  endif
  
 libtirpc-1.3.1.orig/libtirpc.pc.in 2020-12-01 15:06:57.0 +
-+++ libtirpc-1.3.1/libtirpc.pc.in  2020-12-06 23:28:58.851720446 +
-@@ -8,5 +8,5 @@
- Requires:
- Version: @PACKAGE_VERSION@
- Libs: -L${libdir} -ltirpc
--Libs.private: -lpthread
-+Libs.private: -lpthread @GSSAPI_LIBS@
- Cflags: -I${includedir}/tirpc


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libtirpc.git/commitdiff/aef6da5256f8bc9cfd2d49aa41821a8a5a11b672

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/util-linux] - added systemd bcond to allow building without BR systemd dependency note: only files affected by

2021-03-21 Thread hawk

commit 0deefbb8c7e83c1353d80cb17c11064249ff48e2
Author: Marcin Krol 
Date:   Sun Mar 21 13:45:45 2021 +

- added systemd bcond to allow building without BR systemd dependency
  note: only files affected by --without-systemd configure flag are
  excluded by bcond

 util-linux.spec | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index 173d5b1..d173142 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -14,6 +14,7 @@
 %bcond_without dietlibc# link initrd version with dietlibc instead of 
uClibc
 %bcond_without selinux # SELinux support
 %bcond_without su  # su/runuser programs
+%bcond_without systemd # systemd
 %if "%{pld_release}" == "ac"
 %bcond_withinitrd  # don't build initrd version
 %bcond_withfallocate   # fallocate utility (needs glibc 2.11 to 
compile)
@@ -91,7 +92,7 @@ BuildRequires:readline-devel
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: sed >= 4.0
-BuildRequires: systemd-devel >= 1:209
+%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel
 BuildRequires: xz
@@ -867,7 +868,9 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses 
-DHAVE_LSEEK64_PROTOTYPE
--with-bashcompletiondir=/usr/share/bash-completion/completions \
--with-selinux%{!?with_selinux:=no} \
--with-smack \
-   --with-readline
+   --with-readline \
+   %{!?with_systemd:--without-systemd}
+
 
 %{__make}
 
@@ -1177,8 +1180,10 @@ fi
 %attr(755,root,root) %{_sbindir}/rfkill
 %attr(755,root,root) %{_sbindir}/rtcwake
 
+%if %{with systemd}
 %{systemdunitdir}/fstrim.service
 %{systemdunitdir}/fstrim.timer
+%endif
 
 %{_mandir}/man1/cal.1*
 %{_mandir}/man1/choom.1*
@@ -1585,8 +1590,10 @@ fi
 %attr(6755,uuidd,uuidd) %{_sbindir}/uuidd
 %attr(2775,uuidd,uuidd) /var/lib/libuuid
 %{_mandir}/man8/uuidd.8*
+%if %{with systemd}
 %{systemdunitdir}/uuidd.service
 %{systemdunitdir}/uuidd.socket
+%endif
 
 %files -n libfdisk
 %defattr(644,root,root,755)


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/0deefbb8c7e83c1353d80cb17c11064249ff48e2

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/pam] - rediffed

2021-03-21 Thread hawk

commit 587b47b56e6b85f4459dd6a0d7fd42498792444b
Author: Marcin Krol 
Date:   Sun Mar 21 13:31:53 2021 +0100

- rediffed

 pam-exec-failok.patch  | 38 +++---
 pam-pld-modules.patch  | 16 +---
 pam-tally-fail-close.patch | 15 ---
 3 files changed, 36 insertions(+), 33 deletions(-)
---
diff --git a/pam-exec-failok.patch b/pam-exec-failok.patch
index 2018a41..953be16 100644
--- a/pam-exec-failok.patch
+++ b/pam-exec-failok.patch
@@ -1,7 +1,8 @@
 Linux-PAM-0.99.7.1/modules/pam_exec/pam_exec.8.xml~2006-06-09 
18:44:06.0 +0200
-+++ Linux-PAM-0.99.7.1/modules/pam_exec/pam_exec.8.xml 2007-02-09 
22:35:07.0 +0100
-@@ -25,6 +25,9 @@
- quiet
+diff -urNp -x '*.orig' Linux-PAM-1.4.0.org/modules/pam_exec/pam_exec.8.xml 
Linux-PAM-1.4.0/modules/pam_exec/pam_exec.8.xml
+--- Linux-PAM-1.4.0.org/modules/pam_exec/pam_exec.8.xml2020-06-08 
12:17:27.0 +0200
 Linux-PAM-1.4.0/modules/pam_exec/pam_exec.8.xml2021-03-21 
13:20:06.503594925 +0100
+@@ -34,6 +34,9 @@
+ stdout


 +failok
@@ -9,11 +10,12 @@
 +  
  log=file

-   
-@@ -90,6 +93,18 @@
+   
+@@ -172,6 +175,18 @@
+ 

  
- 
++
 +
 +  
 +failok
@@ -25,21 +27,21 @@
 +
 +  
 +
-+
+ 

  
- 
 Linux-PAM-0.99.7.1/modules/pam_exec/pam_exec.c.orig2007-02-09 
22:30:39.0 +0100
-+++ Linux-PAM-0.99.7.1/modules/pam_exec/pam_exec.c 2007-02-09 
22:37:07.0 +0100
-@@ -64,6 +64,7 @@
+diff -urNp -x '*.orig' Linux-PAM-1.4.0.org/modules/pam_exec/pam_exec.c 
Linux-PAM-1.4.0/modules/pam_exec/pam_exec.c
+--- Linux-PAM-1.4.0.org/modules/pam_exec/pam_exec.c2020-06-08 
12:17:27.0 +0200
 Linux-PAM-1.4.0/modules/pam_exec/pam_exec.c2021-03-21 
13:20:06.504594925 +0100
+@@ -93,6 +93,7 @@ call_exec (const char *pam_type, pam_han
int debug = 0;
int call_setuid = 0;
int quiet = 0;
 +  int fail_ok = 0;
int expose_authtok = 0;
+   int use_stdout = 0;
int optargc;
-   const char *logfile = NULL;
-@@ -85,6 +86,8 @@
+@@ -135,6 +136,8 @@ call_exec (const char *pam_type, pam_han
quiet = 1;
else if (strcasecmp (argv[optargc], "expose_authtok") == 0)
expose_authtok = 1;
@@ -48,7 +50,7 @@
else
break; /* Unknown option, assume program to execute. */
  }
-@@ -115,29 +118,32 @@
+@@ -271,7 +274,7 @@ call_exec (const char *pam_type, pam_han
{
  pam_syslog (pamh, LOG_ERR, "%s failed: exit code %d",
  argv[optargc], WEXITSTATUS(status));
@@ -57,8 +59,7 @@
  pam_error (pamh, _("%s failed: exit code %d"),
 argv[optargc], WEXITSTATUS(status));
}
- else if (WIFSIGNALED(status))
-   {
+@@ -280,7 +283,7 @@ call_exec (const char *pam_type, pam_han
  pam_syslog (pamh, LOG_ERR, "%s failed: caught signal %d%s",
  argv[optargc], WTERMSIG(status),
  WCOREDUMP(status) ? " (core dumped)" : "");
@@ -67,8 +68,7 @@
  pam_error (pamh, _("%s failed: caught signal %d%s"),
 argv[optargc], WTERMSIG(status),
 WCOREDUMP(status) ? " (core dumped)" : "");
-   }
- else
+@@ -289,11 +292,14 @@ call_exec (const char *pam_type, pam_han
{
  pam_syslog (pamh, LOG_ERR, "%s failed: unknown status 0x%x",
  argv[optargc], status);
diff --git a/pam-pld-modules.patch b/pam-pld-modules.patch
index 9b09e93..bc71fab 100644
--- a/pam-pld-modules.patch
+++ b/pam-pld-modules.patch
@@ -1,17 +1,19 @@
 Linux-PAM-0.99.5.0/configure.in.redhat-modules 2006-06-28 
09:25:02.0 +0200
-+++ Linux-PAM-0.99.5.0/configure.ac2006-06-30 10:24:35.0 +0200
-@@ -492,6 +492,8 @@
-   libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \
+diff -urNp -x '*.orig' Linux-PAM-1.4.0.org/configure.ac 
Linux-PAM-1.4.0/configure.ac
+--- Linux-PAM-1.4.0.org/configure.ac   2020-06-08 12:17:27.0 +0200
 Linux-PAM-1.4.0/configure.ac   2021-03-21 13:19:44.088594925 +0100
+@@ -712,6 +712,8 @@ AC_CONFIG_FILES([Makefile libpam/Makefil
po/Makefile.in \
+   Make.xml.rules \
modules/Makefile \
 +  modules/pam_console/Makefile modules/pam_pwexport/Makefile \
 +  modules/pam_pwgen/Makefile modules/pam_rps/Makefile \
modules/pam_access/Makefile modules/pam_cracklib/Makefile \
  modules/pam_debug/Makefile modules/pam_deny/Makefile \
modules/pam_echo/Makefile modules/pam_env/Makefile \
 Linux-PAM-1.4.0/modules/Makefile.am.orig   2020-08-25 19:33:40.370451732 
+0200
-+++ Linux-PAM-1.4.0/modules/Makefile.am2020-08-25 19:35:12.873283934 
+0200
-@@ -98,6 +98,10 @@
+diff -urNp -x '*.orig'

[packages/bash] - rediffed

2021-03-21 Thread hawk

commit 0507c857a3a18822884717f0859249384863cd63
Author: Marcin Krol 
Date:   Sun Mar 21 13:30:13 2021 +0100

- rediffed

 bash-paths.patch|  33 +++
 bash-profile.patch  |  11 ++---
 bash-requires.patch | 113 +++-
 3 files changed, 73 insertions(+), 84 deletions(-)
---
diff --git a/bash-paths.patch b/bash-paths.patch
index 21736d5..5c98b7d 100644
--- a/bash-paths.patch
+++ b/bash-paths.patch
@@ -1,17 +1,6 @@
-diff -urbB bash-3.0.org/config.h.in bash-3.0/config.h.in
 bash-3.0.org/config.h.in   2004-07-21 22:08:31.0 +0200
-+++ bash-3.0/config.h.in   2005-10-08 19:35:26.593219000 +0200
-@@ -197,7 +197,7 @@
- 
- /* System paths */
- 
--#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
-+#define DEFAULT_MAIL_DIRECTORY "/var/mail"
- 
- /* Characteristics of the system's header files and libraries that affect
-the compilation environment. */
 bash-5.0/config-top.h~ 2019-03-21 14:06:54.0 +0100
-+++ bash-5.0/config-top.h  2019-03-21 14:08:18.043987487 +0100
+diff -urNp -x '*.orig' bash-5.1.org/config-top.h bash-5.1/config-top.h
+--- bash-5.1.org/config-top.h  2020-11-16 16:34:26.0 +0100
 bash-5.1/config-top.h  2021-03-21 13:21:08.467594925 +0100
 @@ -63,7 +63,7 @@
  /* The default value of the PATH variable. */
  #ifndef DEFAULT_PATH_VALUE
@@ -30,8 +19,8 @@ diff -urbB bash-3.0.org/config.h.in bash-3.0/config.h.in
  #endif
  
  /* Default primary and secondary prompt strings. */
-@@ -73,7 +73,7 @@
- #define KSH_COMPATIBLE_SELECT
+@@ -91,7 +91,7 @@
+ #define DEFAULT_BASHRC "~/.bashrc"
  
  /* System-wide .bashrc file for interactive shells. */
 -/* #define SYS_BASHRC "/etc/bash.bashrc" */
@@ -39,3 +28,15 @@ diff -urbB bash-3.0.org/config.h.in bash-3.0/config.h.in
  
  /* System-wide .bash_logout for login shells. */
  /* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
+diff -urNp -x '*.orig' bash-5.1.org/config.h.in bash-5.1/config.h.in
+--- bash-5.1.org/config.h.in   2020-05-19 19:54:22.0 +0200
 bash-5.1/config.h.in   2021-03-21 13:21:08.467594925 +0100
+@@ -247,7 +247,7 @@
+ 
+ /* System paths */
+ 
+-#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
++#define DEFAULT_MAIL_DIRECTORY "/var/mail"
+ 
+ /* Characteristics of the system's header files and libraries that affect
+the compilation environment. */
diff --git a/bash-profile.patch b/bash-profile.patch
index 6bcae68..5ae804c 100644
--- a/bash-profile.patch
+++ b/bash-profile.patch
@@ -1,8 +1,9 @@
 bash-2.03/config-top.h.profile Mon Feb 22 14:37:17 1999
-+++ bash-2.03/config-top.h Mon Feb 22 14:37:29 1999
-@@ -3,6 +3,8 @@
- /* This contains various user-settable options not under the control of
-autoconf. */
+diff -urNp -x '*.orig' bash-5.1.org/config-top.h bash-5.1/config-top.h
+--- bash-5.1.org/config-top.h  2021-03-21 13:21:19.045594925 +0100
 bash-5.1/config-top.h  2021-03-21 13:21:19.703594925 +0100
+@@ -18,6 +18,8 @@
+along with Bash.  If not, see .
+ */
  
 +#define NON_INTERACTIVE_LOGIN_SHELLS
 +
diff --git a/bash-requires.patch b/bash-requires.patch
index 35670bd..0c7b192 100644
--- a/bash-requires.patch
+++ b/bash-requires.patch
@@ -1,19 +1,6 @@
-diff --git a/builtins.h b/builtins.h
-index dac95fd..5b7e811 100644
 a/builtins.h
-+++ b/builtins.h
-@@ -45,6 +45,7 @@
- #define ASSIGNMENT_BUILTIN 0x10   /* This builtin takes assignment 
statements. */
- #define POSIX_BUILTIN 0x20/* This builtins is special in the Posix 
command search order. */
- #define LOCALVAR_BUILTIN   0x40   /* This builtin creates local variables 
*/
-+#define REQUIRES_BUILTIN 0x80  /* This builtin requires other files. */
- 
- #define BASE_INDENT   4
- 
-diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c
-index 4f51201..91c25db 100644
 a/builtins/mkbuiltins.c
-+++ b/builtins/mkbuiltins.c
+diff -urNp -x '*.orig' bash-5.1.org/builtins/mkbuiltins.c 
bash-5.1/builtins/mkbuiltins.c
+--- bash-5.1.org/builtins/mkbuiltins.c 2020-06-05 19:14:43.0 +0200
 bash-5.1/builtins/mkbuiltins.c 2021-03-21 13:21:29.803594925 +0100
 @@ -69,10 +69,15 @@ extern char *strcpy ();
  #define whitespace(c) (((c) == ' ') || ((c) == '\t'))
  
@@ -59,7 +46,7 @@ index 4f51201..91c25db 100644
  
array_add ((char *)new, defs->builtins);
building_builtin = 1;
-@@ -1250,12 +1265,13 @@ write_builtins (defs, structfile, externfile)
+@@ -1250,12 +1265,13 @@ write_builtins (defs, structfile, extern
  else
fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
  
@@ -88,10 +75,20 @@ index 4f51201..91c25db 100644
  #if !defined (HAVE_RENAME)
  static int
  rename (from, to)
-diff --git a/doc/bash.1 b/doc/bash.1
-index d91f1fd..111a66d 100644
 a/doc/bash.1
-+++ b/doc/bash.1
+diff -urNp -x '*.orig' bash-5.1.org/builtins.h bash-5.1/builtins.h
+--- bash-5.1.org/builtins.h2017-04-19 15:15:48.0 +0200
 bash-5.1/builtins.h

[packages/gmp] - rediffed

2021-03-21 Thread hawk

commit 669e5778377de53abde92af8b96190d094873c2b
Author: Marcin Krol 
Date:   Sun Mar 21 12:57:20 2021 +0100

- rediffed

 gmp-info.patch | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/gmp-info.patch b/gmp-info.patch
index bb8bf23..c977f7b 100644
--- a/gmp-info.patch
+++ b/gmp-info.patch
@@ -1,8 +1,9 @@
 gmp-4.2/doc/gmp.texi.orig  Thu Oct  5 01:24:56 2000
-+++ gmp-4.2/doc/gmp.texi   Fri Aug 10 14:52:52 2001
-@@ -9,9 +9,10 @@
- @end iftex
- @comment %**end of header
+diff -urNp -x '*.orig' gmp-6.2.1.org/doc/gmp.texi gmp-6.2.1/doc/gmp.texi
+--- gmp-6.2.1.org/doc/gmp.texi 2020-11-14 19:45:09.0 +0100
 gmp-6.2.1/doc/gmp.texi 2021-03-21 12:57:05.678931009 +0100
+@@ -64,9 +64,10 @@ software''.  A copy of the license is in
+ @c  may want to search-and-replace to some online source.
+ @c
  
 -@dircategory GNU libraries
 +@dircategory Libraries:
@@ -12,4 +13,4 @@
 +  Library
  @end direntry
  
- @c smallbook
+ @c  html 


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gmp.git/commitdiff/669e5778377de53abde92af8b96190d094873c2b

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

< 1 2 3 4 5 6 7 8 9 10 >

301 - 400 of 8344 matches

Mail list logo