[packages/silc-client] - updated to 1.1.11; build textui client for now - added libs patch (fixes build with system silc-to

qboosh qboosh at pld-linux.org
Sun Feb 28 21:34:23 CET 2021 

commit cc48259a490d9f8c4cf0bca58f85e9da9775ed7c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 28 21:35:11 2021 +0100

    - updated to 1.1.11; build textui client for now
    - added libs patch (fixes build with system silc-toolkit)
    - added format patch (fixes build with -Werror=format-security)

 silc-client-format.patch | 20 +++++++++++
 silc-client-libs.patch   | 30 ++++++++++++++++
 silc-client.spec         | 89 +++++++++++++++++++++++++++++++-----------------
 3 files changed, 107 insertions(+), 32 deletions(-)
---
diff --git a/silc-client.spec b/silc-client.spec
index 2be1b61..13141b4 100644
--- a/silc-client.spec
+++ b/silc-client.spec
@@ -1,18 +1,30 @@
+# TODO: irssi plugin (--with-silc-plugin=%{_libdir}/irssi)
+#
+# Conditional build:
+%bcond_with	perl	 # Perl support (requires perl-Irssi)
+
 Summary:	Secure Internet Live Conferencing
-Summary(pl.UTF-8):	SIRC - bezpieczne konferencje na żywo poprzez internet
+Summary(pl.UTF-8):	SIRC - bezpieczne konferencje na żywo poprzez Internet
 Name:		silc-client
-Version:	0.6
-Release:	2
-License:	GPL
+Version:	1.1.11
+Release:	1
+License:	GPL v2
 Group:		Applications/Communications
-Source0:	http://silcnet.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	e81887e2864454f2194be22b006953f1
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	glib-devel >= 1.2.0
+#Source0Download: http://silcnet.org/client.html
+Source0:	http://downloads.sourceforge.net/silc/%{name}-%{version}.tar.bz2
+# Source0-md5:	cd47e57d61e7acf38d4283e6e98f2625
+Patch0:		%{name}-libs.patch
+Patch1:		%{name}-format.patch
+URL:		http://silcnet.org/client.html
+BuildRequires:	autoconf >= 2.52
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	glib2-devel >= 1:2.6.0
+BuildRequires:	libtool
 BuildRequires:	ncurses-devel >= 5.0
-BuildRequires:	perl-base >= 1:5.6.1
-URL:		http://silcnet.org/
+%{?with_perl:BuildRequires:	perl-devel >= 1:5.6.1}
+BuildRequires:	pkgconfig
+# silc >= 1.1, silcclient >= 1.1.1
+BuildRequires:	silc-toolkit-devel >= 1.1.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,43 +43,56 @@ konferencyjnych - cała reszta jest odmnienna od znanej z IRC.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+
+# missing files in dist, but we don't need them, just stub
+install -d lib/silcutil/symbian
+touch lib/silcutil/symbian/Makefile.am
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
+%{__automake}
+cd apps/irssi
+%{__libtoolize}
+%{__aclocal} -I.
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ../..
 %configure \
 	--with-helpdir=%{_datadir}/%{name}/help \
-	--with-simdir=%{_libdir}/%{name}/modules \
-	--with-etcdir=%{_sysconfdir}/%{name} \
-	--with-logsdir=/tmp
+	%{!?with_perl:--without-perl} \
+	%{?with_perl:--with-perl-lib=vendor}
+#	--with-silc-plugin=%{_libdir}/irssi
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{perl_sitearch}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-%{makeinstall} \
-	helpdir=$RPM_BUILD_ROOT%{_datadir}/%{name}/help \
-	silc_etcdir=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
-	silc_modulesdir=$RPM_BUILD_ROOT%{_libdir}/%{name}/modules \
-	docdir=$RPM_BUILD_ROOT%{_docdir}
-
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/silcd.conf
+# interesting files packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CREDITS README TODO doc/FAQ doc/example_silc.conf
-%attr(755,root,root) %{_bindir}/*
-%dir %{_sysconfdir}/%{name}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*
-
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/modules
-%attr(755,root,root) %{_libdir}/%{name}/modules/*.so
-
-%{_datadir}/%{name}
+%doc CREDITS ChangeLog README README.PLUGIN TODO doc/FAQ
+%attr(755,root,root) %{_bindir}/silc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/silc.conf
+%{_datadir}/silc
+%if %{with perl}
+# TODO: BR: perl-Irssi
+%{perl_vendorarch}/Irssi/Silc.pm
+%dir %{perl_vendorarch}/auto/Irssi/Silc
+%attr(755,root,root) %{perl_vendorarch}/auto/Irssi/Silc/Silc.so
+%endif
+%{_mandir}/man1/silc.1*
diff --git a/silc-client-format.patch b/silc-client-format.patch
new file mode 100644
index 0000000..44674ae
--- /dev/null
+++ b/silc-client-format.patch
@@ -0,0 +1,20 @@
+--- silc-client-1.1.11/apps/irssi/src/core/network.c.orig	2014-05-12 19:53:02.000000000 +0200
++++ silc-client-1.1.11/apps/irssi/src/core/network.c	2021-02-27 21:37:18.687764401 +0100
+@@ -356,7 +356,7 @@
+ 
+ 	status = g_io_channel_read_chars(handle, buf, len, &ret, &err);
+ 	if (err != NULL) {
+-	        g_warning(err->message);
++	        g_warning("%s", err->message);
+ 	        g_error_free(err);
+ 	}
+ 	if (status == G_IO_STATUS_ERROR || status == G_IO_STATUS_EOF)
+@@ -377,7 +377,7 @@
+ 
+ 	status = g_io_channel_write_chars(handle, (char *) data, len, &ret, &err);
+ 	if (err != NULL) {
+-	        g_warning(err->message);
++	        g_warning("%s", err->message);
+ 	        g_error_free(err);
+ 	}
+ 	if (status == G_IO_STATUS_ERROR)
diff --git a/silc-client-libs.patch b/silc-client-libs.patch
new file mode 100644
index 0000000..3861744
--- /dev/null
+++ b/silc-client-libs.patch
@@ -0,0 +1,30 @@
+--- silc-client-1.1.11/configure.ac.orig	2014-05-13 08:47:22.000000000 +0200
++++ silc-client-1.1.11/configure.ac	2021-02-27 18:59:41.935662691 +0100
+@@ -635,12 +635,11 @@
+ 
+   if test x$compile_libs = xfalse; then
+     LIBSUBDIR=
+-    LIBS="$SILC_LIBS $LIBS"
+     CFLAGS="$CFLAGS $SILC_CFLAGS"
+-    LIBS="$SILCCLIENT_LIBS $LIBS"
+     CFLAGS="$CFLAGS $SILCCLIENT_CFLAGS"
+   else
+-    LDFLAGS="-L\$(silc_top_srcdir)/lib $LDFLAGS"
++    SILC_LIBS="\$(silc_top_srcdir)/lib/libsilc.la"
++    SILCCLIENT_LIBS="\$(silc_top_srcdir)/lib/libsilc.la"
+   fi
+ fi
+ 
+--- silc-client-1.1.11/apps/irssi/src/silc/core/Makefile.am.orig	2014-05-13 08:46:59.000000000 +0200
++++ silc-client-1.1.11/apps/irssi/src/silc/core/Makefile.am	2021-02-27 19:00:07.735522921 +0100
+@@ -7,9 +7,7 @@
+ 
+ if SILCPLUGIN
+ EXTRA_CFLAGS=-DSILC_PLUGIN
+-LBDD= \
+-	$(top_srcdir)/../../lib/libsilc.la \
+-	$(top_srcdir)/../../lib/libsilcclient.la
++LBDD=$(SILCCLIENT_LIBS) $(SILC_LIBS)
+ LTLB= libsilc_core.la
+ NILB=
+ LBLDFLGS= \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/silc-client.git/commitdiff/cc48259a490d9f8c4cf0bca58f85e9da9775ed7c

More information about the pld-cvs-commit mailing list