[syslog-ng][PATCH] more complete RPMs for RedHat 7.3 and beyond.
Blaise St-Laurent
syslog-ng@lists.balabit.hu
Fri, 21 Feb 2003 16:41:10 -0500
This is a multi-part message in MIME format.
------=_NextPart_000_0019_01C2D9C8.09FB35A0
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
I've attached a spec file that makes building and installing syslog-ng
1.6.0rc1 on Redhat quite a bit easier. Once the rpm files are built, all
that is required is a
service syslog stop
chkconfig --del syslog
chkconfig --add syslog-ng
service syslog-ng start
I've altered the spec file (i also fixed a typo in the source: url) and
added the necessary files (/etc/sysconfig/syslog-ng) to be able to use the
supplied init script (as found in the contrib directory)
Hopefully this can get into the next version so i can stop giving my client
a custom build :)
If there are any problems, please report them to me.
Blaise St-Laurent
Senior Security Architect
613-266-4258
____________________________________________________________________
Okiok Data http://www.okiok.com (450) 681-1681
Solutions de sécurité d'entreprise et d'affaires électroniques
Enterprise and e-business security solutions
This e-mail message (including attachments, if any) is intended for the use
of the individual or entity to which it is addressed and may contain
information that is privileged, proprietary, confidential and exempt from
disclosure. If you are not the intended recipient, you are notified that any
dissemination, distribution or copying of this communication is strictly
prohibited. If you have received this communication in error, please notify
the sender and erase this e-mail message immediately.
Le présent message électronique (y compris les pièces qui y sont annexées,
le cas échéant) s'adresse au destinataire indiqué et peut contenir des
renseignements de caractère privé ou confidentiel. Si vous n'êtes pas le
destinataire de ce document, nous vous signalons qu'il est strictement
interdit de le diffuser, de le distribuer ou de le reproduire. Si ce message
vous a été transmis par erreur, veuillez en informer l'expéditeur et le
supprimer immédiatement.
------=_NextPart_000_0019_01C2D9C8.09FB35A0
Content-Type: application/octet-stream;
name="rpmfix.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="rpmfix.patch"
diff -Naur syslog-ng-1.6.0rc1-clean/contrib/Makefile.am =
syslog-ng-1.6.0rc1-mod/contrib/Makefile.am=0A=
--- syslog-ng-1.6.0rc1-clean/contrib/Makefile.am 2002-09-27 =
10:55:46.000000000 -0400=0A=
+++ syslog-ng-1.6.0rc1-mod/contrib/Makefile.am 2003-02-21 =
16:29:18.000000000 -0500=0A=
@@ -1,3 +1,3 @@=0A=
=0A=
-EXTRA_DIST =3D README init.d.solaris init.d.HP-UX init.d.RedHat =
init.d.SuSE init.d.SunOS init.d.solaris syslog-ng.conf.HP-UX =
syslog-ng.conf.RedHat syslog-ng.conf.SunOS syslog2ng syslog-ng.vim =
init.d.RedHat-7.3=0A=
+EXTRA_DIST =3D README init.d.solaris init.d.HP-UX init.d.RedHat =
init.d.SuSE init.d.SunOS init.d.solaris syslog-ng.conf.HP-UX =
syslog-ng.conf.RedHat syslog-ng.conf.SunOS syslog2ng syslog-ng.vim =
init.d.RedHat-7.3 syslog-ng.sysconfig=0A=
=0A=
diff -Naur syslog-ng-1.6.0rc1-clean/contrib/Makefile.in =
syslog-ng-1.6.0rc1-mod/contrib/Makefile.in=0A=
--- syslog-ng-1.6.0rc1-clean/contrib/Makefile.in 2003-02-20 =
09:58:33.000000000 -0500=0A=
+++ syslog-ng-1.6.0rc1-mod/contrib/Makefile.in 2003-02-21 =
16:29:19.000000000 -0500=0A=
@@ -1,6 +1,8 @@=0A=
-# Makefile.in generated automatically by automake 1.4-p4 from =
Makefile.am=0A=
+# Makefile.in generated by automake 1.6.3 from Makefile.am.=0A=
+# @configure_input@=0A=
=0A=
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.=0A=
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002=0A=
+# Free Software Foundation, Inc.=0A=
# This Makefile.in is free software; the Free Software Foundation=0A=
# gives unlimited permission to copy and/or distribute it,=0A=
# with or without modifications, as long as this notice is preserved.=0A=
@@ -10,7 +12,7 @@=0A=
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A=0A=
# PARTICULAR PURPOSE.=0A=
=0A=
-=0A=
+@SET_MAKE@=0A=
SHELL =3D @SHELL@=0A=
=0A=
srcdir =3D @srcdir@=0A=
@@ -31,13 +33,9 @@=0A=
mandir =3D @mandir@=0A=
includedir =3D @includedir@=0A=
oldincludedir =3D /usr/include=0A=
-=0A=
-DESTDIR =3D=0A=
-=0A=
pkgdatadir =3D $(datadir)/@PACKAGE@=0A=
pkglibdir =3D $(libdir)/@PACKAGE@=0A=
pkgincludedir =3D $(includedir)/@PACKAGE@=0A=
-=0A=
top_builddir =3D ..=0A=
=0A=
ACLOCAL =3D @ACLOCAL@=0A=
@@ -45,22 +43,31 @@=0A=
AUTOMAKE =3D @AUTOMAKE@=0A=
AUTOHEADER =3D @AUTOHEADER@=0A=
=0A=
+am__cd =3D CDPATH=3D"$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd=0A=
INSTALL =3D @INSTALL@=0A=
-INSTALL_PROGRAM =3D @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)=0A=
+INSTALL_PROGRAM =3D @INSTALL_PROGRAM@=0A=
INSTALL_DATA =3D @INSTALL_DATA@=0A=
+install_sh_DATA =3D $(install_sh) -c -m 644=0A=
+install_sh_PROGRAM =3D $(install_sh) -c=0A=
+install_sh_SCRIPT =3D $(install_sh) -c=0A=
INSTALL_SCRIPT =3D @INSTALL_SCRIPT@=0A=
+INSTALL_HEADER =3D $(INSTALL_DATA)=0A=
transform =3D @program_transform_name@=0A=
-=0A=
NORMAL_INSTALL =3D :=0A=
PRE_INSTALL =3D :=0A=
POST_INSTALL =3D :=0A=
NORMAL_UNINSTALL =3D :=0A=
PRE_UNINSTALL =3D :=0A=
POST_UNINSTALL =3D :=0A=
+=0A=
+EXEEXT =3D @EXEEXT@=0A=
+OBJEXT =3D @OBJEXT@=0A=
+PATH_SEPARATOR =3D @PATH_SEPARATOR@=0A=
CC =3D @CC@=0A=
LEX =3D @LEX@=0A=
+LEXLIB =3D @LEXLIB@=0A=
+LEX_OUTPUT_ROOT =3D @LEX_OUTPUT_ROOT@=0A=
LIBOBJS =3D @LIBOBJS@=0A=
-MAKEINFO =3D @MAKEINFO@=0A=
MAKE_CLASS =3D @MAKE_CLASS@=0A=
PACKAGE =3D @PACKAGE@=0A=
VERSION =3D @VERSION@=0A=
@@ -68,105 +75,124 @@=0A=
YFLAGS =3D @YFLAGS@=0A=
klogctl =3D @klogctl@=0A=
=0A=
-EXTRA_DIST =3D README init.d.solaris init.d.HP-UX init.d.RedHat =
init.d.SuSE init.d.SunOS init.d.solaris syslog-ng.conf.HP-UX =
syslog-ng.conf.RedHat syslog-ng.conf.SunOS syslog2ng syslog-ng.vim =
init.d.RedHat-7.3=0A=
+EXTRA_DIST =3D README init.d.solaris init.d.HP-UX init.d.RedHat =
init.d.SuSE init.d.SunOS init.d.solaris syslog-ng.conf.HP-UX =
syslog-ng.conf.RedHat syslog-ng.conf.SunOS syslog2ng syslog-ng.vim =
init.d.RedHat-7.3 syslog-ng.sysconfig=0A=
+subdir =3D contrib=0A=
mkinstalldirs =3D $(SHELL) $(top_srcdir)/mkinstalldirs=0A=
-CONFIG_HEADER =3D ../src/config.h=0A=
-CONFIG_CLEAN_FILES =3D =0A=
-DIST_COMMON =3D README Makefile.am Makefile.in=0A=
-=0A=
+CONFIG_HEADER =3D $(top_builddir)/src/config.h=0A=
+CONFIG_CLEAN_FILES =3D=0A=
+DIST_SOURCES =3D=0A=
+DIST_COMMON =3D README Makefile.am Makefile.in=0A=
+all: all-am=0A=
=0A=
-DISTFILES =3D $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) =
$(EXTRA_DIST)=0A=
-=0A=
-TAR =3D tar=0A=
-GZIP_ENV =3D --best=0A=
-all: all-redirect=0A=
.SUFFIXES:=0A=
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in =
$(ACLOCAL_M4) =0A=
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/Makefile=0A=
-=0A=
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status=0A=
- cd $(top_builddir) \=0A=
- && CONFIG_FILES=3D$(subdir)/$@ CONFIG_HEADERS=3D $(SHELL) =
./config.status=0A=
-=0A=
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in =
$(ACLOCAL_M4)=0A=
+ cd $(top_srcdir) && \=0A=
+ $(AUTOMAKE) --gnu contrib/Makefile=0A=
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status=0A=
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ =
$(am__depfiles_maybe)=0A=
+uninstall-info-am:=0A=
tags: TAGS=0A=
TAGS:=0A=
=0A=
+DISTFILES =3D $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)=0A=
=0A=
-distdir =3D $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)=0A=
-=0A=
-subdir =3D contrib=0A=
+top_distdir =3D ..=0A=
+distdir =3D $(top_distdir)/$(PACKAGE)-$(VERSION)=0A=
=0A=
distdir: $(DISTFILES)=0A=
- @for file in $(DISTFILES); do \=0A=
- d=3D$(srcdir); \=0A=
+ @list=3D'$(DISTFILES)'; for file in $$list; do \=0A=
+ if test -f $$file || test -d $$file; then d=3D.; else d=3D$(srcdir); =
fi; \=0A=
+ dir=3D`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \=0A=
+ if test "$$dir" !=3D "$$file" && test "$$dir" !=3D "."; then \=0A=
+ dir=3D"/$$dir"; \=0A=
+ $(mkinstalldirs) "$(distdir)$$dir"; \=0A=
+ else \=0A=
+ dir=3D''; \=0A=
+ fi; \=0A=
if test -d $$d/$$file; then \=0A=
- cp -pr $$d/$$file $(distdir)/$$file; \=0A=
+ if test -d $(srcdir)/$$file && test $$d !=3D $(srcdir); then \=0A=
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \=0A=
+ fi; \=0A=
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \=0A=
else \=0A=
test -f $(distdir)/$$file \=0A=
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \=0A=
- || cp -p $$d/$$file $(distdir)/$$file || :; \=0A=
+ || cp -p $$d/$$file $(distdir)/$$file \=0A=
+ || exit 1; \=0A=
fi; \=0A=
done=0A=
-info-am:=0A=
-info: info-am=0A=
-dvi-am:=0A=
-dvi: dvi-am=0A=
check-am: all-am=0A=
check: check-am=0A=
-installcheck-am:=0A=
-installcheck: installcheck-am=0A=
-install-exec-am:=0A=
-install-exec: install-exec-am=0A=
+all-am: Makefile=0A=
=0A=
-install-data-am:=0A=
-install-data: install-data-am=0A=
+installdirs:=0A=
=0A=
-install-am: all-am=0A=
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am=0A=
install: install-am=0A=
-uninstall-am:=0A=
+install-exec: install-exec-am=0A=
+install-data: install-data-am=0A=
uninstall: uninstall-am=0A=
-all-am: Makefile=0A=
-all-redirect: all-am=0A=
-install-strip:=0A=
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=3D-s install=0A=
-installdirs:=0A=
=0A=
+install-am: all-am=0A=
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am=0A=
=0A=
+installcheck: installcheck-am=0A=
+install-strip:=0A=
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \=0A=
+ INSTALL_STRIP_FLAG=3D-s \=0A=
+ `test -z '$(STRIP)' || \=0A=
+ echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install=0A=
mostlyclean-generic:=0A=
=0A=
clean-generic:=0A=
=0A=
distclean-generic:=0A=
-rm -f Makefile $(CONFIG_CLEAN_FILES)=0A=
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*=0A=
=0A=
maintainer-clean-generic:=0A=
-mostlyclean-am: mostlyclean-generic=0A=
+ @echo "This command is intended for maintainers to use"=0A=
+ @echo "it deletes files that may require special tools to rebuild."=0A=
+clean: clean-am=0A=
=0A=
-mostlyclean: mostlyclean-am=0A=
+clean-am: clean-generic mostlyclean-am=0A=
=0A=
-clean-am: clean-generic mostlyclean-am=0A=
+distclean: distclean-am=0A=
=0A=
-clean: clean-am=0A=
+distclean-am: clean-am distclean-generic=0A=
=0A=
-distclean-am: distclean-generic clean-am=0A=
+dvi: dvi-am=0A=
=0A=
-distclean: distclean-am=0A=
+dvi-am:=0A=
=0A=
-maintainer-clean-am: maintainer-clean-generic distclean-am=0A=
- @echo "This command is intended for maintainers to use;"=0A=
- @echo "it deletes files that may require special tools to rebuild."=0A=
+info: info-am=0A=
+=0A=
+info-am:=0A=
+=0A=
+install-data-am:=0A=
+=0A=
+install-exec-am:=0A=
+=0A=
+install-info: install-info-am=0A=
+=0A=
+install-man:=0A=
+=0A=
+installcheck-am:=0A=
=0A=
maintainer-clean: maintainer-clean-am=0A=
=0A=
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \=0A=
-installcheck-am installcheck install-exec-am install-exec \=0A=
-install-data-am install-data install-am install uninstall-am uninstall \=0A=
-all-redirect all-am all installdirs mostlyclean-generic \=0A=
-distclean-generic clean-generic maintainer-clean-generic clean \=0A=
-mostlyclean distclean maintainer-clean=0A=
+maintainer-clean-am: distclean-am maintainer-clean-generic=0A=
+=0A=
+mostlyclean: mostlyclean-am=0A=
+=0A=
+mostlyclean-am: mostlyclean-generic=0A=
+=0A=
+uninstall-am: uninstall-info-am=0A=
=0A=
+.PHONY: all all-am check check-am clean clean-generic distclean \=0A=
+ distclean-generic distdir dvi dvi-am info info-am install \=0A=
+ install-am install-data install-data-am install-exec \=0A=
+ install-exec-am install-info install-info-am install-man \=0A=
+ install-strip installcheck installcheck-am installdirs \=0A=
+ maintainer-clean maintainer-clean-generic mostlyclean \=0A=
+ mostlyclean-generic uninstall uninstall-am uninstall-info-am=0A=
=0A=
# Tell versions [3.59,3.63) of GNU make to not export all variables.=0A=
# Otherwise a system limit (for SysV at least) may be exceeded.=0A=
diff -Naur syslog-ng-1.6.0rc1-clean/contrib/syslog-ng.conf.RedHat =
syslog-ng-1.6.0rc1-mod/contrib/syslog-ng.conf.RedHat=0A=
--- syslog-ng-1.6.0rc1-clean/contrib/syslog-ng.conf.RedHat 2002-08-22 =
07:12:00.000000000 -0400=0A=
+++ syslog-ng-1.6.0rc1-mod/contrib/syslog-ng.conf.RedHat 2003-02-21 =
16:29:20.000000000 -0500=0A=
@@ -7,6 +7,9 @@=0A=
#=0A=
# 20000925 gb@sysfive.com=0A=
#=0A=
+# Updated by Blaise St-Laurent (<bstlaurent@okiok.com>) - 21 Feb 2003=0A=
+# - changed from unix-stream to unix-dgram in order to work with =0A=
+# logrotate=0A=
# Updated by Frank Crawford (<Frank.Crawford@ac3.com.au>) - 10 Aug 2002=0A=
# - for Red Hat 7.3=0A=
# - totally do away with klogd=0A=
@@ -26,7 +29,7 @@=0A=
keep_hostname (yes);=0A=
};=0A=
=0A=
-source s_sys { pipe ("/proc/kmsg" log_prefix("kernel: ")); unix-stream =
("/dev/log"); internal(); };=0A=
+source s_sys { pipe ("/proc/kmsg" log_prefix("kernel: ")); unix-dgram =
("/dev/log"); internal(); };=0A=
=0A=
destination d_cons { file("/dev/console"); };=0A=
destination d_mesg { file("/var/log/messages"); };=0A=
diff -Naur syslog-ng-1.6.0rc1-clean/contrib/syslog-ng.sysconfig =
syslog-ng-1.6.0rc1-mod/contrib/syslog-ng.sysconfig=0A=
--- syslog-ng-1.6.0rc1-clean/contrib/syslog-ng.sysconfig 1969-12-31 =
19:00:00.000000000 -0500=0A=
+++ syslog-ng-1.6.0rc1-mod/contrib/syslog-ng.sysconfig 2003-02-21 =
16:29:20.000000000 -0500=0A=
@@ -0,0 +1,5 @@=0A=
+# /etc/sysconfig/syslog-ng =0A=
+# Created by Blaise St-Laurent <bstlaurent@okiok.com> on 21 Feb 2003=0A=
+# Works with the supplied (in contribs) init script for RedHat-7.3 and =
8.0=0A=
+=0A=
+SYSLOGNG_OPTIONS=3D"-f /etc/syslog-ng/syslog-ng.conf"=0A=
diff -Naur syslog-ng-1.6.0rc1-clean/syslog-ng.spec.in =
syslog-ng-1.6.0rc1-mod/syslog-ng.spec.in=0A=
--- syslog-ng-1.6.0rc1-clean/syslog-ng.spec.in 2000-11-29 =
06:15:39.000000000 -0500=0A=
+++ syslog-ng-1.6.0rc1-mod/syslog-ng.spec.in 2003-02-21 =
16:24:30.000000000 -0500=0A=
@@ -10,10 +10,11 @@=0A=
Release: %{release}=0A=
Group: System Environment/Daemons=0A=
Copyright: GPL=0A=
+requires: libol >=3D 0.3.9=0A=
=0A=
Url: http://www.balabit.hu/products/syslog-ng/=0A=
=0A=
-Source: =
http://www.balabit.hu/downloads/syslog-ng/1.4/syslog-ng-%{version}.tar.gz=0A=
+Source: =
http://www.balabit.hu/downloads/syslog-ng/1.6/syslog-ng-%{version}.tar.gz=0A=
Buildroot: /var/tmp/%{name}-%{version}-%{release}-root=0A=
=0A=
%description=0A=
@@ -32,12 +33,25 @@=0A=
# NOTE: Install syslog-ng in /sbin instead of the prefix (/usr =
usually).=0A=
make prefix=3D$RPM_BUILD_ROOT%{prefix} sbindir=3D$RPM_BUILD_ROOT/sbin =
install-strip=0A=
=0A=
+mkdir -p $RPM_BUILD_ROOT/etc/syslog-ng=0A=
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig=0A=
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d=0A=
+=0A=
+install -m644 contrib/syslog-ng.conf.RedHat =
$RPM_BUILD_ROOT/etc/syslog-ng/syslog-ng.conf=0A=
+install -m644 contrib/syslog-ng.sysconfig =
$RPM_BUILD_ROOT/etc/sysconfig/syslog-ng=0A=
+install -m644 contrib/init.d.RedHat-7.3 =
$RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng=0A=
+=0A=
+=0A=
%files=0A=
%defattr(-,root,root)=0A=
%doc AUTHORS COPYING README ChangeLog INSTALL NEWS=0A=
%doc doc=0A=
%attr(755,root,root) /sbin/syslog-ng=0A=
%{prefix}/man=0A=
+%dir /etc/syslog-ng=0A=
+%config /etc/rc.d/init.d/syslog-ng=0A=
+%config /etc/syslog-ng/syslog-ng.conf=0A=
+%config /etc/sysconfig/syslog-ng=0A=
=0A=
%clean=0A=
rm -r $RPM_BUILD_ROOT=0A=
------=_NextPart_000_0019_01C2D9C8.09FB35A0--