From c090d96c56629e859a0c8af5f03951c01c0226a0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 21 Dec 2006 23:19:21 +0000 Subject: [PATCH 1/4] Initialize branch FC-6 for sqlgrey --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 1eb696538d5e16b21f78b72ea9266b920d64a5b0 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Tue, 27 Mar 2007 18:49:48 +0000 Subject: [PATCH 2/4] Sync with devel. --- .cvsignore | 2 +- sources | 2 +- sqlgrey.spec | 25 ++++++++++++------------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index 48b729a..b7d088e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sqlgrey-1.7.4.tar.bz2 +sqlgrey-1.7.5.tar.bz2 diff --git a/sources b/sources index acdc407..cea9ebb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b84931d638c3527e2dabc26ad6754bc0 sqlgrey-1.7.4.tar.bz2 +53d6c3f318af8ffdd176361242268309 sqlgrey-1.7.5.tar.bz2 diff --git a/sqlgrey.spec b/sqlgrey.spec index e32d2a4..4e67354 100644 --- a/sqlgrey.spec +++ b/sqlgrey.spec @@ -1,6 +1,6 @@ Name: sqlgrey -Version: 1.7.4 -Release: 5%{?dist} +Version: 1.7.5 +Release: 1%{?dist} Summary: Postfix grey-listing policy service Group: System Environment/Daemons License: GPL @@ -19,8 +19,6 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service -Requires(postun): fedora-usermgmt -Requires(pre): fedora-usermgmt %description SQLgrey is a Postfix grey-listing policy service with auto-white-listing @@ -67,9 +65,11 @@ rm -rf $RPM_BUILD_ROOT %attr(644,root,root) %config %{_sysconfdir}/sqlgrey/README %pre -/usr/sbin/fedora-groupadd 26 -r sqlgrey &>/dev/null || : -/usr/sbin/fedora-useradd 26 -r -s /sbin/nologin -d /var/lib/sqlgrey -M \ - -c 'SQLgrey Server' -g sqlgrey sqlgrey &>/dev/null || : +if ! id sqlgrey &>/dev/null ; then + /usr/sbin/groupadd -r sqlgrey || : + /usr/sbin/useradd -r -s /sbin/nologin -d /var/lib/sqlgrey -M \ + -c 'SQLgrey Server' -g sqlgrey sqlgrey || : +fi %post /sbin/chkconfig --add sqlgrey || : @@ -81,13 +81,12 @@ if [ "$1" -eq 0 ]; then /sbin/chkconfig --del sqlgrey || : fi -%postun -if [ "$1" -eq 0 ]; then - /usr/sbin/fedora-userdel sqlgrey &>/dev/null || : - /usr/sbin/fedora-groupdel sqlgrey &>/dev/null || : -fi - %changelog +* Mon Mar 12 2007 Steven Pritchard 1.7.5-1 +- Update to 1.7.5 +- Drop fedora-usermgmt requirement +- Don't remove the sqlgrey user on uninstall + * Thu Dec 14 2006 Steven Pritchard 1.7.4-5 - Add missing echos to init script From 1d808365d87d51a452a9d9ef2b4050eb1fae781f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:42:58 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b923d32..bd7a56e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: sqlgrey -# $Id$ +# $Id: Makefile,v 1.1 2006/12/19 01:57:56 steve Exp $ NAME := sqlgrey SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 940d3f5b04023ca9e47b3b2a34674ae33f62fef8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 13:06:55 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index bd7a56e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: sqlgrey -# $Id: Makefile,v 1.1 2006/12/19 01:57:56 steve Exp $ -NAME := sqlgrey -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6