Revision: 6672
http://ipcop.svn.sourceforge.net/ipcop/?rev=6672&view=rev
Author: gespinasse
Date: 2012-06-26 19:59:03 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Upgrade logrotate to 3.8.1
that should fix a missbehavior with size directive (see Red Hat Bug 723547)
Use debian package to fix a bit more issues
Pass CFLAGS to Makefile using RPM_OPT_FLAGS
Run the test suite.
For that, it is required to open the tar with --no-same-owner
--no-same-permissions
or tests fail with 'parent directory has insecure permissions'
Modified Paths:
--------------
ipcop/trunk/lfs/logrotate
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Modified: ipcop/trunk/lfs/logrotate
===================================================================
--- ipcop/trunk/lfs/logrotate 2012-06-26 06:24:32 UTC (rev 6671)
+++ ipcop/trunk/lfs/logrotate 2012-06-26 19:59:03 UTC (rev 6672)
@@ -32,26 +32,30 @@
include Config
-PKG_NAME = logrotate
-VER = 3.8.0
-HOST_ARCH = all
-OTHER_SRC = yes
+PKG_NAME := logrotate
+VER := 3.8.1
+HOST_ARCH := all
+OTHER_SRC := yes
-THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = https://fedorahosted.org/releases/l/o/logrotate
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+THISAPP := $(PKG_NAME)-$(VER)
+DL_FILE := $(THISAPP).tar.gz
+DL_FROM := https://fedorahosted.org/releases/l/o/logrotate
+DIR_APP := $(DIR_SRC)/$(THISAPP)
+TARGET := $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+PATCH1 := $(PKG_NAME)_$(VER)-4.debian.tar.gz
+
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(PATCH1)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE):= $(DL_FROM)/$(DL_FILE)
+$(PATCH1) :=http://ftp.de.debian.org/debian/pool/main/l/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5 = 590f77c13077a4c384dbec7ca9c5f242
+$(DL_FILE)_MD5:= bd2e20d8dc644291b08f9215397d28a5
+$(PATCH1)_MD5 := 28de52e34c5bfe3d5fe2fc709a5ff686
install : $(TARGET)
@@ -80,9 +84,18 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar --no-same-owner
--no-same-permissions -zxf $(DIR_DL)/$(DL_FILE)
+ # Apply patches on debian order
+ cd $(DIR_APP) && tar zxf $(DIR_DL)/$(PATCH1)
+ cd $(DIR_APP) && for patch in `cat debian/patches/series` ; do patch
-p1 -i debian/patches/$$patch; done
- cd $(DIR_APP) && make
+ cd $(DIR_APP) && make RPM_OPT_FLAGS="$(CFLAGS)"
+
+ifeq "$(RUNNING_TEST)" "yes"
+ # no test should fail
+ cd $(DIR_APP)/test && ./test &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+endif
+
cd $(DIR_APP) && make install
touch /var/lib/logrotate.status
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-06-26 06:24:32 UTC
(rev 6671)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-06-26 19:59:03 UTC
(rev 6672)
@@ -402,6 +402,9 @@
## fixes needed for linux 3.0
/usr/lib/libparted.so.1.0.0
##
+## logrotate-3.8.1
+/usr/sbin/logrotate
+##
## lsof-4.86
/usr/sbin/lsof
##
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-06-26 06:24:32 UTC (rev
6671)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-06-26 19:59:03 UTC (rev
6672)
@@ -13,7 +13,7 @@
gmp to 5.0.5, gnupg to 1.4.12, grep to 2.12, gzip to 1.5,
iproute2 to 3.4.0, iptables to 1.4.14, iw to 3.4 hdparm to 9.39,
kernel to 3.0.36, krb5 to 1.9.4,
libffi to 3.0.10, libgd to 2.0.36~rc1, libgcrypt to 1.5.0,
libnetfiltercontrack to 1.0.1, libnl to 3.2.11, libpng to 1.5.10,
- libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.8.0, lsof to 4.86,
+ libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.8.0, logrotate to 3.8.1, lsof to 4.86,
net-tools to 1.60-p20120127084908, openldap to 2.4.30, openssh to
6.0, openssl to 1.0.1c, openswan to 2.6.38,
pcre to 8.30, pixman to 0.24.4, procps to 3.3.3, psmisc to 22.19,
rsyslog to 5.8.9, shadow to 4.1.5.1, sqlite to 3.7.13, squid to
3.1.20, squid-langpack to 20120329,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
