new upstream version
This commit is contained in:
Steve
parent
b6abd8b2e8
commit
83aa9f2d0a
|
|
@ -8,3 +8,4 @@ prelude-manager-0.9.14.2.tar.gz
|
|||
prelude-manager-0.9.15.tar.gz
|
||||
prelude-manager-1.0.0rc1.tar.gz
|
||||
prelude-manager-1.0.0.tar.gz
|
||||
/prelude-manager-1.0.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
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 \
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
diff -ur prelude-manager-0.9.15.orig/configure prelude-manager-0.9.15/configure
|
||||
--- prelude-manager-0.9.15.orig/configure 2009-07-10 09:05:32.000000000 -0400
|
||||
+++ prelude-manager-0.9.15/configure 2009-07-10 09:16:47.000000000 -0400
|
||||
@@ -41642,6 +41642,8 @@
|
||||
diff -ur prelude-manager-1.0.1.orig/configure prelude-manager-1.0.1/configure
|
||||
--- prelude-manager-1.0.1.orig/configure 2011-03-24 14:06:38.000000000 -0400
|
||||
+++ prelude-manager-1.0.1/configure 2011-03-24 14:08:00.000000000 -0400
|
||||
@@ -31131,6 +31131,8 @@
|
||||
|
||||
:
|
||||
LDFLAGS="$LDFLAGS -z now"
|
||||
|
|
@ -10,18 +10,18 @@ diff -ur prelude-manager-0.9.15.orig/configure prelude-manager-0.9.15/configure
|
|||
|
||||
else
|
||||
|
||||
diff -ur prelude-manager-0.9.15.orig/configure.in prelude-manager-0.9.15/configure.in
|
||||
--- prelude-manager-0.9.15.orig/configure.in 2009-07-10 09:05:32.000000000 -0400
|
||||
+++ prelude-manager-0.9.15/configure.in 2009-07-10 09:16:21.000000000 -0400
|
||||
@@ -249,6 +249,7 @@
|
||||
|
||||
diff -ur prelude-manager-1.0.1.orig/configure.in prelude-manager-1.0.1/configure.in
|
||||
--- prelude-manager-1.0.1.orig/configure.in 2011-03-24 14:06:38.000000000 -0400
|
||||
+++ prelude-manager-1.0.1/configure.in 2011-03-24 14:08:00.000000000 -0400
|
||||
@@ -250,6 +250,7 @@
|
||||
AC_PROG_CXX
|
||||
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 \
|
||||
@@ -305,6 +306,7 @@
|
||||
@@ -306,6 +307,7 @@
|
||||
AC_SUBST(LDFLAGS)
|
||||
AC_SUBST(GLOBAL_CFLAGS)
|
||||
AC_SUBST(PRELUDE_MANAGER_CFLAGS)
|
||||
|
|
@ -29,19 +29,19 @@ diff -ur prelude-manager-0.9.15.orig/configure.in prelude-manager-0.9.15/configu
|
|||
|
||||
AC_CONFIG_FILES([
|
||||
|
||||
diff -ur prelude-manager-0.9.15.orig/libev/Makefile.am prelude-manager-0.9.15/libev/Makefile.am
|
||||
--- prelude-manager-0.9.15.orig/libev/Makefile.am 2009-07-10 09:05:32.000000000 -0400
|
||||
+++ prelude-manager-0.9.15/libev/Makefile.am 2009-07-10 09:19:16.000000000 -0400
|
||||
diff -ur prelude-manager-1.0.1.orig/libev/Makefile.am prelude-manager-1.0.1/libev/Makefile.am
|
||||
--- prelude-manager-1.0.1.orig/libev/Makefile.am 2011-03-24 14:06:38.000000000 -0400
|
||||
+++ prelude-manager-1.0.1/libev/Makefile.am 2011-03-24 14:08:00.000000000 -0400
|
||||
@@ -1,4 +1,5 @@
|
||||
EXTRA_DIST=LICENSE Changes README ev_epoll.c ev_kqueue.c ev_poll.c ev_port.c ev_select.c ev_win32.c
|
||||
+AM_CFLAGS = -fPIC -DPIC
|
||||
noinst_HEADERS = ev.h ev_vars.h ev_wrap.h
|
||||
noinst_LTLIBRARIES = libev.la
|
||||
libev_la_SOURCES = ev.c
|
||||
diff -ur prelude-manager-0.9.15.orig/libev/Makefile.in prelude-manager-0.9.15/libev/Makefile.in
|
||||
--- prelude-manager-0.9.15.orig/libev/Makefile.in 2009-07-10 09:05:32.000000000 -0400
|
||||
+++ prelude-manager-0.9.15/libev/Makefile.in 2009-07-10 09:18:17.000000000 -0400
|
||||
@@ -161,7 +161,7 @@
|
||||
diff -ur prelude-manager-1.0.1.orig/libev/Makefile.in prelude-manager-1.0.1/libev/Makefile.in
|
||||
--- prelude-manager-1.0.1.orig/libev/Makefile.in 2011-03-24 14:06:38.000000000 -0400
|
||||
+++ prelude-manager-1.0.1/libev/Makefile.in 2011-03-24 14:08:00.000000000 -0400
|
||||
@@ -180,7 +180,7 @@
|
||||
BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
|
|
@ -50,10 +50,10 @@ diff -ur prelude-manager-0.9.15.orig/libev/Makefile.in prelude-manager-0.9.15/li
|
|||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
diff -ur prelude-manager-0.9.15.orig/src/Makefile.am prelude-manager-0.9.15/src/Makefile.am
|
||||
--- prelude-manager-0.9.15.orig/src/Makefile.am 2009-07-10 09:05:32.000000000 -0400
|
||||
+++ prelude-manager-0.9.15/src/Makefile.am 2009-07-10 09:17:17.000000000 -0400
|
||||
@@ -28,7 +28,7 @@
|
||||
diff -ur prelude-manager-1.0.1.orig/src/Makefile.am prelude-manager-1.0.1/src/Makefile.am
|
||||
--- prelude-manager-1.0.1.orig/src/Makefile.am 2011-03-24 14:06:38.000000000 -0400
|
||||
+++ prelude-manager-1.0.1/src/Makefile.am 2011-03-24 14:08:00.000000000 -0400
|
||||
@@ -36,7 +36,7 @@
|
||||
-dlopen $(top_builddir)/plugins/reports/relaying/relaying.la \
|
||||
-dlopen $(top_builddir)/plugins/reports/smtp/smtp.la \
|
||||
-dlopen $(top_builddir)/plugins/reports/textmod/textmod.la \
|
||||
|
|
@ -62,10 +62,10 @@ diff -ur prelude-manager-0.9.15.orig/src/Makefile.am prelude-manager-0.9.15/src/
|
|||
|
||||
prelude_manager_SOURCES = \
|
||||
bufpool.c \
|
||||
diff -ur prelude-manager-0.9.15.orig/src/Makefile.in prelude-manager-0.9.15/src/Makefile.in
|
||||
--- prelude-manager-0.9.15.orig/src/Makefile.in 2009-07-10 09:05:32.000000000 -0400
|
||||
+++ prelude-manager-0.9.15/src/Makefile.in 2009-07-10 09:17:05.000000000 -0400
|
||||
@@ -719,7 +719,7 @@
|
||||
diff -ur prelude-manager-1.0.1.orig/src/Makefile.in prelude-manager-1.0.1/src/Makefile.in
|
||||
--- prelude-manager-1.0.1.orig/src/Makefile.in 2011-03-24 14:06:38.000000000 -0400
|
||||
+++ prelude-manager-1.0.1/src/Makefile.in 2011-03-24 14:08:00.000000000 -0400
|
||||
@@ -944,7 +944,7 @@
|
||||
-dlopen $(top_builddir)/plugins/reports/relaying/relaying.la \
|
||||
-dlopen $(top_builddir)/plugins/reports/smtp/smtp.la \
|
||||
-dlopen $(top_builddir)/plugins/reports/textmod/textmod.la \
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Name: prelude-manager
|
||||
Epoch: 1
|
||||
Version: 1.0.0
|
||||
Release: 4%{?dist}
|
||||
Version: 1.0.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Prelude-Manager
|
||||
|
||||
Group: Applications/Internet
|
||||
|
|
@ -9,7 +9,7 @@ License: GPLv2+
|
|||
URL: http://www.prelude-ids.org
|
||||
Source0: http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz
|
||||
Source1: %{name}.init
|
||||
Patch1: %{name}-0.9.15-pie.patch
|
||||
Patch1: %{name}-1.0.1-pie.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: libpreludedb-devel, libxml2-devel
|
||||
|
|
@ -155,6 +155,9 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 24 2011 Steve Grubb <sgrubb@redhat.com> 1.0.1-1
|
||||
- new upstream version
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue