rpms/prelude-manager/F-9 prelude-manager-0.9.12-pie.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 prelude-manager.spec, 1.5, 1.6 sources, 1.4, 1.5

Thu Apr 24 16:57:59 UTC 2008

Author: sgrubb

Update of /cvs/pkgs/rpms/prelude-manager/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6409

Modified Files:
	.cvsignore prelude-manager.spec sources 
Added Files:
	prelude-manager-0.9.12-pie.patch 
Log Message:
* Thu Apr 24 2008 Steve Grubb <sgrubb at redhat.com> 0.9.12-1
- new upstream version 0.9.12


prelude-manager-0.9.12-pie.patch:

--- NEW FILE prelude-manager-0.9.12-pie.patch ---
diff -ur prelude-manager-0.9.12.orig/configure prelude-manager-0.9.12/configure
--- prelude-manager-0.9.12.orig/configure	2008-04-12 14:20:31.000000000 -0400
+++ prelude-manager-0.9.12/configure	2008-04-12 14:56:42.000000000 -0400
@@ -35030,6 +35030,8 @@
 
     :
     LDFLAGS="$LDFLAGS -z now"
+    AR_FLAGS="$AR_FLAGS -fPIC"
+    PRELUDE_MANAGER_CFLAGS="$PRELUDE_MANAGER_CFLAGS -fPIE -DPIE"
 
 else
 
diff -ur prelude-manager-0.9.12.orig/configure.in prelude-manager-0.9.12/configure.in
--- prelude-manager-0.9.12.orig/configure.in	2008-04-12 14:20:31.000000000 -0400
+++ prelude-manager-0.9.12/configure.in	2008-04-12 14:55:35.000000000 -0400
@@ -239,6 +239,7 @@
 
 AX_LD_CHECK_FLAG(-z relro, , , LDFLAGS="$LDFLAGS -z relro")
 AX_LD_CHECK_FLAG(-z now, , , LDFLAGS="$LDFLAGS -z now")
+AX_C_CHECK_FLAG(-fPIE -DPIE, , , PRELUDE_MANAGER_CFLAGS="$PRELUDE_MANAGER_CFLAGS -fPIE -DPIE"; PRELUDE_MANAGER_LDFLAGS="-pie"; AR_FLAGS="$AR_FLAGS -fPIC")
 
 for i in -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \
          -Wbad-function-cast -Wcast-qual -Wcast-align -Wnested-externs -Wunused \
@@ -294,6 +295,7 @@
 AC_SUBST(LDFLAGS)
 AC_SUBST(GLOBAL_CFLAGS)
 AC_SUBST(PRELUDE_MANAGER_CFLAGS)
+AC_SUBST(PRELUDE_MANAGER_LDFLAGS)
 
 AC_CONFIG_FILES([
 
diff -ur prelude-manager-0.9.12.orig/src/Makefile.am prelude-manager-0.9.12/src/Makefile.am
--- prelude-manager-0.9.12.orig/src/Makefile.am	2008-04-12 14:20:31.000000000 -0400
+++ prelude-manager-0.9.12/src/Makefile.am	2008-04-12 14:55:35.000000000 -0400
@@ -27,7 +27,7 @@
         -dlopen $(top_builddir)/plugins/reports/debug/debug.la \
         -dlopen $(top_builddir)/plugins/reports/relaying/relaying.la \
         -dlopen $(top_builddir)/plugins/reports/textmod/textmod.la \
-        $(DLOPENED_OBJS)
+        @PRELUDE_MANAGER_LDFLAGS@ $(DLOPENED_OBJS)
 
 prelude_manager_SOURCES = \
 	bufpool.c	  \
diff -ur prelude-manager-0.9.12.orig/src/Makefile.in prelude-manager-0.9.12/src/Makefile.in
--- prelude-manager-0.9.12.orig/src/Makefile.in	2008-04-12 14:20:31.000000000 -0400
+++ prelude-manager-0.9.12/src/Makefile.in	2008-04-12 14:55:46.000000000 -0400
@@ -508,7 +508,7 @@
         -dlopen $(top_builddir)/plugins/reports/debug/debug.la \
         -dlopen $(top_builddir)/plugins/reports/relaying/relaying.la \
         -dlopen $(top_builddir)/plugins/reports/textmod/textmod.la \
-        $(DLOPENED_OBJS)
+        $(DLOPENED_OBJS) -pie
 
 prelude_manager_SOURCES = \
 	bufpool.c	  \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Feb 2008 12:02:14 -0000	1.4
+++ .cvsignore	24 Apr 2008 16:57:23 -0000	1.5
@@ -1,3 +1,4 @@
 prelude-manager-0.9.7.1.tar.gz
 prelude-manager-0.9.10.tar.gz
 prelude-manager-0.9.11.tar.gz
+prelude-manager-0.9.12.tar.gz


Index: prelude-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/F-9/prelude-manager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- prelude-manager.spec	5 Feb 2008 12:02:14 -0000	1.5
+++ prelude-manager.spec	24 Apr 2008 16:57:23 -0000	1.6
@@ -1,13 +1,14 @@
 Name:		prelude-manager           
-Version:	0.9.11
+Version:	0.9.12
 Release:	1%{?dist}
 Summary:	Prelude-Manager
 
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2+
 URL:		http://www.prelude-ids.org
 Source0:	http://www.prelude-ids.org/download/releases/%{name}-%{version}.tar.gz
 Patch0:		%{name}-0.9.7-initd.patch
+Patch1:		%{name}-0.9.12-pie.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpreludedb-devel, libxml2-devel
@@ -87,6 +88,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 sed -i.debug -e '/nlist/s|\$rm|: $rm|' ltmain.sh
 
 %build
@@ -125,7 +127,7 @@
 %postun 
 /sbin/ldconfig
 if [ "$1" -ge "1" ]; then
-        /sbin/service %{name} condrestart >/dev/null 2>&1 || :
+	/sbin/service %{name} condrestart >/dev/null 2>&1 || :
 fi
 
 %files
@@ -149,7 +151,7 @@
 %dir %{_datadir}/%{name}/
 %dir %{_defaultdocdir}/%{name}-%{version}/
 %doc %attr(0644,root,root) %{_defaultdocdir}/%{name}-%{version}/*
-%{_mandir}/man1/prelude-manager.1.gz
+%attr(0644,root,root) %{_mandir}/man1/prelude-manager.1.gz
 
 %files db-plugin
 %defattr(-,root,root)
@@ -168,11 +170,8 @@
 
 
 %changelog
-* Tue Feb 05 2008 Steve Grubb <sgrubb at redhat.com> 0.9.11-1
-- new upstream version
-
-* Sat Jan 19 2008 Steve Grubb <sgrubb at redhat.com> 0.9.10-2
-- Adjust start/stop priority
+* Thu Apr 24 2008 Steve Grubb <sgrubb at redhat.com> 0.9.12-1
+- new upstream version 0.9.12
 
 * Mon Jan 14 2008 Steve Grubb <sgrubb at redhat.com> 0.9.10-1
 - new upstream version 0.9.10


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/prelude-manager/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Feb 2008 12:02:14 -0000	1.4
+++ sources	24 Apr 2008 16:57:23 -0000	1.5
@@ -1 +1 @@
-eb7863fc6ce2212b519e704604740f1a  prelude-manager-0.9.11.tar.gz
+60be3113caa01d3389433aa5b43880b6  prelude-manager-0.9.12.tar.gz


