OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Apr-2008 09:32:14
Branch: HEAD Handle: 2008040408321300
Modified files:
openpkg-src/apache-security
apache-security.spec
Log:
upgrading package: apache-security 2.1.5 -> 2.1.7
Summary:
Revision Changes Path
1.15 +12 -11 openpkg-src/apache-security/apache-security.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-security/apache-security.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 apache-security.spec
--- openpkg-src/apache-security/apache-security.spec 16 Jan 2008 21:49:04
-0000 1.14
+++ openpkg-src/apache-security/apache-security.spec 4 Apr 2008 07:32:13
-0000 1.15
@@ -22,8 +22,9 @@
##
# package version
-%define V_module 2.1.5
-%define V_rules 2.1-1.5.1
+%define V_major 2.1
+%define V_minor 7
+%define V_rules 1.5.1
# package information
Name: apache-security
@@ -35,12 +36,12 @@
Class: EVAL
Group: Web
License: Open Source
-Version: %{V_module}
-Release: 20080116
+Version: %{V_major}.%{V_minor}
+Release: 20080404
# list of sources
-Source0:
http://www.modsecurity.org/download/modsecurity-apache_%{V_module}.tar.gz
-Source1:
http://www.modsecurity.org/download/modsecurity-core-rules_%{V_rules}.tar.gz
+Source0:
http://www.modsecurity.org/download/modsecurity-apache_%{V_major}.%{V_minor}.tar.gz
+Source1:
http://www.modsecurity.org/download/modsecurity-core-rules_%{V_major}-%{V_rules}.tar.gz
Source2: apache-security.conf
Patch0: apache-security.patch
@@ -59,20 +60,20 @@
%track
prog apache-security:module = {
- version = %{V_module}
+ version = %{V_major}.%{V_minor}
url = http://www.modsecurity.org/download/direct.html
- regex = modsecurity-apache_(\d+\.\d+\.\d+)\.tar\.gz
+ regex = modsecurity-apache_(%{V_major}(\.\d+)+)\.tar\.gz
}
prog apache-security:rules = {
version = %{V_rules}
url = http://www.modsecurity.org/download/direct.html
- regex =
modsecurity-core-rules_(\d+\.\d+(\.\d+)?-\d+\.\d+(\.\d+)?)\.tar\.gz
+ regex = modsecurity-core-rules_%{V_major}-(\d+(\.\d+)+)\.tar\.gz
}
%prep
- %setup -q -n modsecurity-apache_%{V_module}
+ %setup -q -n modsecurity-apache_%{V_major}.%{V_minor}
( cd rules
- %{l_gzip} -dc %{SOURCE modsecurity-core-rules_%{V_rules}.tar.gz} |
%{l_tar} xf -
+ %{l_gzip} -dc %{SOURCE
modsecurity-core-rules_%{V_major}-%{V_rules}.tar.gz} | %{l_tar} xf -
# remove config rule set of the ModSecurity core rule set as
# we handle those setting in our default configuration file
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
