[packages/msyslog] - updated to 1.09d; added configure,no-strip,link patches

qboosh qboosh at pld-linux.org
Wed Jul 19 21:57:03 CEST 2023 

commit 002c70d7f41c00a5055e899d3645f5c7416b4fc7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 19 21:43:37 2023 +0200

    - updated to 1.09d; added configure,no-strip,link patches

 msyslog-DESTDIR.patch   | 32 +++++++++++++++++++++++++++----
 msyslog-configure.patch |  8 ++++++++
 msyslog-link.patch      | 15 +++++++++++++++
 msyslog-no-strip.patch  | 11 +++++++++++
 msyslog.spec            | 50 ++++++++++++++++++++++++++++++++-----------------
 5 files changed, 95 insertions(+), 21 deletions(-)
---
diff --git a/msyslog.spec b/msyslog.spec
index 896a4ab..c3f8c04 100644
--- a/msyslog.spec
+++ b/msyslog.spec
@@ -1,19 +1,22 @@
 Summary:	A daemon for the syslog system log interface
 Summary(pl.UTF-8):	Modularny demon sysloga
 Name:		msyslog
-Version:	1.09c
-Release:	2
+Version:	1.09d
+Release:	1
 Group:		Daemons
 License:	BSD
-Source0:	http://dl.sourceforge.net/msyslog/%{name}-v%{version}-src.tar.gz
-# Source0-md5:	1e9119a051f3febf79802bb059a2f727
+Source0:	https://downloads.sourceforge.net/msyslog/%{name}-v%{version}-src.tar.gz
+# Source0-md5:	641b4d01756b6aac5a5d332893aefce0
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	syslog.conf
 Source4:	syslog.logrotate
 Patch0:		%{name}-DESTDIR.patch
 Patch1:		%{name}-pathes.patch
-URL:		http://www.core-sdi.com/english/freesoft.html
+Patch2:		%{name}-configure.patch
+Patch3:		%{name}-no-strip.patch
+Patch4:		%{name}-link.patch
+URL:		https://sourceforge.net/projects/msyslog/
 BuildRequires:	autoconf
 BuildRequires:	automake
 Requires(post,preun):	/sbin/chkconfig
@@ -25,6 +28,9 @@ Conflicts:	syslog
 Conflicts:	syslog-ng
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# uses symbols from binary
+%define		skip_post_check_so	libmsyslog.so.*
+
 %description
 This project is intended as a whole revision of previous Secure
 Syslogd project (wich is unsupported by now). It has all
@@ -51,9 +57,15 @@ linux, unix, tcp i udp.
 %setup -q -n %{name}-v%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+# missing "_" in filenames (but expected by makefiles)
+%{__mv} src/modules/{im,im_}file.c
+%{__mv} src/man/{im,im_}file.8
 
 %build
-rm -f missing
 %{__aclocal}
 %{__autoconf}
 %configure \
@@ -73,8 +85,8 @@ install -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/syslog.conf
 install -D %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/syslog
 
 install -d $RPM_BUILD_ROOT%{_mandir}/man{5,8}
-install src/man/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
-install src/man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
+cp -p src/man/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
+cp -p src/man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,17 +99,21 @@ rm -rf $RPM_BUILD_ROOT
 if [ "$1" = "0" ]; then
 	%service msyslog stop
 	/sbin/chkconfig --del msyslog
-	
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/* AUTHORS INSTALL NEWS README src/examples
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(755,root,root) %{_sbindir}/*
+%doc AUTHORS INSTALL NEWS README doc/* src/examples
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/msyslog
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog
+%attr(754,root,root) /etc/rc.d/init.d/msyslog
+%attr(755,root,root) %{_sbindir}/msyslogd
+%attr(755,root,root) %{_sbindir}/peochk
 %dir %{_libdir}/alat
-%attr(755,root,root) %{_libdir}/alat/*
-%{_mandir}/man?/*
+%attr(755,root,root) %{_libdir}/alat/libmsyslog.so.%{version}
+%{_mandir}/man5/syslog.conf.5*
+%{_mandir}/man8/im_*.8*
+%{_mandir}/man8/om_*.8*
+%{_mandir}/man8/peochk.8*
+%{_mandir}/man8/syslogd.8*
diff --git a/msyslog-DESTDIR.patch b/msyslog-DESTDIR.patch
index 29e9315..9dc1ffa 100644
--- a/msyslog-DESTDIR.patch
+++ b/msyslog-DESTDIR.patch
@@ -10,7 +10,6 @@ diff -ur msyslog-v1.08e.orig/src/Makefile.in msyslog-v1.08e/src/Makefile.in
  
  PROG=		@MSYSLOG_DAEMON_NAME@
  PROG_FLAGS=	$(CFLAGS) $(CPPFLAGS) $(LIBS) $(SYSLOGD_LIBS) $(MAIN_CPPFLAGS)
-Only in msyslog-v1.08e/src: Makefile.in~
 diff -ur msyslog-v1.08e.orig/src/man/Makefile.in msyslog-v1.08e/src/man/Makefile.in
 --- msyslog-v1.08e.orig/src/man/Makefile.in	Thu Sep 19 22:50:45 2002
 +++ msyslog-v1.08e/src/man/Makefile.in	Thu Sep 19 22:53:50 2002
@@ -23,7 +22,6 @@ diff -ur msyslog-v1.08e.orig/src/man/Makefile.in msyslog-v1.08e/src/man/Makefile
  MAN=    @MANPAGES@
  OMAN=   $(MAN:=.gz)
  INSTALL = @INSTALL@
-Only in msyslog-v1.08e/src/man: Makefile.in~
 diff -ur msyslog-v1.08e.orig/src/modules/Makefile.in msyslog-v1.08e/src/modules/Makefile.in
 --- msyslog-v1.08e.orig/src/modules/Makefile.in	Thu Sep 19 22:50:45 2002
 +++ msyslog-v1.08e/src/modules/Makefile.in	Thu Sep 19 22:54:34 2002
@@ -36,7 +34,6 @@ diff -ur msyslog-v1.08e.orig/src/modules/Makefile.in msyslog-v1.08e/src/modules/
  
  MLIBNAME=	@MLIBNAME@
  MSRCS=		@MSRCS@
-Only in msyslog-v1.08e/src/modules: Makefile.in~
 diff -ur msyslog-v1.08e.orig/src/peo/Makefile.in msyslog-v1.08e/src/peo/Makefile.in
 --- msyslog-v1.08e.orig/src/peo/Makefile.in	Thu Sep 19 22:50:45 2002
 +++ msyslog-v1.08e/src/peo/Makefile.in	Thu Sep 19 22:54:58 2002
@@ -49,4 +46,31 @@ diff -ur msyslog-v1.08e.orig/src/peo/Makefile.in msyslog-v1.08e/src/peo/Makefile
  
  PROG=		peochk
  SRCS=		peochk.c ../options.c @HASH_SRCS@
-Only in msyslog-v1.08e/src/peo: Makefile.in~
+--- msyslog-v1.09d/src/man/GNUmakefile.in.orig	2002-08-14 16:32:21.000000000 +0200
++++ msyslog-v1.09d/src/man/GNUmakefile.in	2023-07-19 21:01:07.164554906 +0200
+@@ -29,9 +29,9 @@
+ #
+ 
+ prefix=	@prefix@
+-MANDIR=	@mandir@
++MANDIR=	$(DESTDIR)@mandir@
+ MAN=	@MANPAGES@
+-OMAN=	$(MAN:=.gz)
++OMAN=	$(MAN)
+ INSTALL=	@INSTALL@
+ 
+ all:
+@@ -40,10 +40,10 @@ all:
+ install maninstall: $(OMAN)
+ 
+ $(OMAN):
+-	@if [ ! -d $(MANDIR)/man$(subst .,,$(suffix $(@:%.gz=%)))/ ]; then \
+-		mkdir -p $(MANDIR)/man$(subst .,,$(suffix $(@:%.gz=%)))/ ;\
++	@if [ ! -d $(DESTDIR)$(MANDIR)/man$(subst .,,$(suffix $@))/ ]; then \
++		mkdir -p $(MANDIR)/man$(subst .,,$(suffix $@))/ ;\
+ 	fi
+-	-gzip -cf $(@:%.gz=%) > $(MANDIR)/man$(subst .,,$(suffix $(@:%.gz=%)))/$@
++	install -p $@ $(MANDIR)/man$(subst .,,$(suffix $@))/$@
+ 
+ clean:
+ 
diff --git a/msyslog-configure.patch b/msyslog-configure.patch
new file mode 100644
index 0000000..23fea33
--- /dev/null
+++ b/msyslog-configure.patch
@@ -0,0 +1,8 @@
+--- msyslog-v1.09d/configure.in.orig	2023-07-19 19:41:55.390297477 +0200
++++ msyslog-v1.09d/configure.in	2023-07-19 19:43:44.196374691 +0200
+@@ -498,5 +498,4 @@ AC_OUTPUT([Makefile
+ 	    src/man/GNUmakefile
+ 	    packaging/Makefile
+ 	    packaging/OpenBSD/Makefile
+-	    packaging/OpenBSD/pkg/PLIST
+ 	    packaging/OpenBSD-devel/Makefile])
diff --git a/msyslog-link.patch b/msyslog-link.patch
new file mode 100644
index 0000000..46d4ab6
--- /dev/null
+++ b/msyslog-link.patch
@@ -0,0 +1,15 @@
+--- msyslog-v1.09d/configure.in.orig	2023-07-19 21:02:26.724123895 +0200
++++ msyslog-v1.09d/configure.in	2023-07-19 21:37:41.122669215 +0200
+@@ -33,9 +33,9 @@ AC_HEADER_TIME
+ AC_STRUCT_TM
+ 
+ dnl Checks for library functions.
+-AC_CHECK_LIB(dl, dlopen, SYSLOGD_LIBS="$SYSLOGD_LIBS -ldl")
+-AC_CHECK_LIB(socket, connect, SYSLOGD_LIBS="$SYSLOGD_LIBS -lsocket")
+-AC_CHECK_LIB(nsl, gethostbyname, SYSLOGD_LIBS="$SYSLOGD_LIBS -lnsl")
++AC_CHECK_FUNC([dlopen], [] , [AC_CHECK_LIB(dl, dlopen, SYSLOGD_LIBS="$SYSLOGD_LIBS -ldl")])
++AC_CHECK_FUNC([connect], [], [AC_CHECK_LIB(socket, connect, SYSLOGD_LIBS="$SYSLOGD_LIBS -lsocket")])
++AC_CHECK_FUNC([gethostbyname], [], [AC_CHECK_LIB(nsl, gethostbyname, SYSLOGD_LIBS="$SYSLOGD_LIBS -lnsl")])
+ AC_DEFINE(SYSLOGD_LIBS, $SYSLOGD_LIBS)
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MEMCMP
diff --git a/msyslog-no-strip.patch b/msyslog-no-strip.patch
new file mode 100644
index 0000000..da61b5d
--- /dev/null
+++ b/msyslog-no-strip.patch
@@ -0,0 +1,11 @@
+--- msyslog-v1.09d/src/Makefile.in.orig	2023-07-19 21:02:26.720790580 +0200
++++ msyslog-v1.09d/src/Makefile.in	2023-07-19 21:34:52.333583624 +0200
+@@ -71,7 +71,7 @@ install-prog:
+ 	@if [ -f "$(INSTALL_DIR)/$(PROG)" ]; then \
+ 		mv -f "$(INSTALL_DIR)/$(PROG)" "$(INSTALL_DIR)/$(PROG).old"; \
+ 	fi
+-	$(INSTALL) -s $(PROG) $(INSTALL_DIR)/ ;
++	$(INSTALL) $(PROG) $(INSTALL_DIR)/ ;
+ 
+ install: install-prog
+ 	@echo -e \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/msyslog.git/commitdiff/002c70d7f41c00a5055e899d3645f5c7416b4fc7

More information about the pld-cvs-commit mailing list