[packages/LPRng] - added format patch (fix build with -Werror=format-security) - added openssl1.1 patch (based on Deb
qboosh
qboosh at pld-linux.org
Wed Nov 14 21:17:42 CET 2018
commit e7651981085cb90e5fdbfc64bc53fc38b16158a3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Nov 14 21:21:45 2018 +0100
- added format patch (fix build with -Werror=format-security)
- added openssl1.1 patch (based on Debian)
- release 3
LPRng-format.patch | 11 +++++++++++
LPRng-openssl1.1.patch | 11 +++++++++++
LPRng.spec | 13 +++++++++----
3 files changed, 31 insertions(+), 4 deletions(-)
---
diff --git a/LPRng.spec b/LPRng.spec
index 00eeb32..87c3805 100644
--- a/LPRng.spec
+++ b/LPRng.spec
@@ -1,3 +1,4 @@
+# NOTE: a bit newer fork is hosted at lprng.sourceforge.net (latest release 3.8.C from 2012)
#
# Conditional build:
%bcond_with kerberos5 # build with kerberos5 support
@@ -10,10 +11,10 @@ Summary(uk.UTF-8): Спулер друку LPRng
Summary(zh_CN.UTF-8): LPRng--打印程序
Name: LPRng
Version: 3.8.35
-Release: 2
+Release: 3
License: GPL v2 with OpenSSL exception or Artistic
Group: Applications/System
-Source0: ftp://ftp.lprng.com/pub/LPRng/LPRng/%{name}-%{version}.tgz
+Source0: http://www.lprng.com/DISTRIB/LPRng/%{name}-%{version}.tgz
# Source0-md5: aaf76e4a94300352514d23bdfa66f0e7
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-pl-man-pages.tar.bz2
# Source1-md5: 4771b1c3598677a8201a9e203235dff3
@@ -27,6 +28,8 @@ Patch5: %{name}-types.patch
Patch6: %{name}-shell.patch
Patch7: %{name}-as-needed.patch
Patch8: %{name}-lpd.conf.patch
+Patch9: %{name}-format.patch
+Patch10: %{name}-openssl1.1.patch
URL: http://www.lprng.com/
BuildRequires: autoconf
BuildRequires: automake
@@ -172,9 +175,11 @@ підтримка аутентикації може бути додана бе
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
-mv PrintingCookbook/{HTML,PrintingCookbook}
-rm -f po/stamp-po
+%{__mv} PrintingCookbook/{HTML,PrintingCookbook}
+%{__rm} po/stamp-po
%build
%{__autoconf}
diff --git a/LPRng-format.patch b/LPRng-format.patch
new file mode 100644
index 0000000..7fb61f3
--- /dev/null
+++ b/LPRng-format.patch
@@ -0,0 +1,11 @@
+--- LPRng-3.8.35/src/common/lpf.c.orig 2005-05-07 19:28:23.000000000 +0200
++++ LPRng-3.8.35/src/common/lpf.c 2018-11-14 17:40:49.334515960 +0100
+@@ -485,7 +485,7 @@
+ case 'x': xwidth = atoi( optargv ); break;
+ case 'y': ylength = atoi( optargv ); break;
+ case 'V':
+- fprintf( stdout, Version );
++ fputs( Version, stdout );
+ Printlist( Copyright, 2 );
+ exit(1);
+ break;
diff --git a/LPRng-openssl1.1.patch b/LPRng-openssl1.1.patch
new file mode 100644
index 0000000..ae51521
--- /dev/null
+++ b/LPRng-openssl1.1.patch
@@ -0,0 +1,11 @@
+--- a/configure.in.orig 2018-11-14 20:57:29.911047886 +0100
++++ b/configure.in 2018-11-14 21:11:48.224371420 +0100
+@@ -1589,7 +1589,7 @@
+ save_LDFLAGS=$LDFLAGS
+ LIBS="-lssl -lcrypto $LIBS"
+ LDFLAGS="$LDFLAGS -L$dir "
+- AC_TRY_LINK_FUNC(SSL_load_error_strings,ac_linked_libssl="true",
++ AC_TRY_LINK_FUNC(OPENSSL_init_ssl,ac_linked_libssl="true",
+ ac_linked_libssl="false");
+ AC_TRY_LINK_FUNC(RC4_set_key,ac_linked_libcrypto="true",
+ ac_linked_libcrypto="false");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/LPRng.git/commitdiff/e7651981085cb90e5fdbfc64bc53fc38b16158a3
More information about the pld-cvs-commit
mailing list