Prva verzija za buster.

diff --git a/README.CARNet b/README.CARNET
similarity index 83%
rename from README.CARNet
rename to README.CARNET
index cbbdab7..a09d5a6 100644 (file)
--- a/README.CARNet
+++ b/README.CARNET
@@ -1,7 +1,7 @@
 mod-security-cn
 ~~~~~~~~~~~~~~~
 
-Ovaj paket sadrzi dodatne CARNetove postavke za ModSecurity.
+Ovaj paket sadrzi dodatne CARNETove postavke za ModSecurity.
 Povlaci instalaciju Debian paketa:
 
   + libapache2-mod-security2
@@ -35,15 +35,15 @@ List) listi.
 
 U slucaju da se adresa nalazi na RBL listi, sa doticne adrese
 nece se moci pristupiti Vasem web posluzitelju.  RBL provjera se
-preskace za adrese koje su iz CARNetove mreze.  Ova funkcionalnost
+preskace za adrese koje su iz CARNETove mreze.  Ova funkcionalnost
 je slicna onoj koju ima Postfix MTA.
 
 RBL posluzitelj koji se koristi za provjeru je:
 
   xbl.dnsbl-sh.carnet.hr
 
-Zbog licencnih razloga pristup CARNetovom RBL posluzitelju je
-dopusten samo iz CARNetove mreze (161.53.0.0/16, 193.198.0.0/16,
+Zbog licencnih razloga pristup CARNETovom RBL posluzitelju je
+dopusten samo iz CARNETove mreze (161.53.0.0/16, 193.198.0.0/16,
 192.84.91.0/24, 192.84.92.0/24, 192.84.105.0/24, 192.84.106.0/24,
 31.147.0.0/16, 82.132.0.0/17 i 2001:b68::/32).
 
@@ -55,4 +55,4 @@ preporuca se da NE brisete i da ne uredjujete navedene
 konfiguracijske datoteke, osim ako znate sto cinite.
 
 
- -- Dragan Dosen <Dragan.Dosen@CARNet.hr>  Wed, 25 May 2016 11:14:53 +0200
+ -- Dragan Dosen <Dragan.Dosen@CARNET.hr>  Wed, 25 May 2016 11:14:53 +0200

diff --git a/debian/changelog b/debian/changelog
index 78e95b0..0d0970c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mod-security-cn (2.9.3+cn10u1) stable; urgency=low
+
+  * Prva verzija za stretch
+
+ -- Ivan Rako <Ivan.Rako@CARNET.hr>  Wed, 11 Nov 2020 23:10:51 +0100
+
 mod-security-cn (2.9.1~cn0) stable; urgency=low
 
   * Prva verzija za stretch

diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10

diff --git a/debian/config b/debian/config
index 487ffe9..30a4473 100644 (file)
--- a/debian/config
+++ b/debian/config
@@ -19,7 +19,7 @@ MODSECCONF="$MODSECDIR/mod-security-cn.conf"
 
 # chk_conf_tag ()
 #
-#   Check if configuration file has CARNet package info lines.
+#   Check if configuration file has CARNET package info lines.
 #   return:  $RET => 0 - tagged
 #                    1 - file does not exists
 #                    2 - file exists, but it is not tagged
@@ -30,7 +30,7 @@ chk_conf_tag () {
   RET=1
 
   if [ -f "$conf_file" ]; then
-    if egrep -q "^## Begin - Generated by CARNet package mod-security-cn$" "$conf_file"; then
+    if egrep -q "^## Begin - Generated by CARNET package mod-security-cn$" "$conf_file"; then
       RET=0
     else
       RET=2
@@ -39,7 +39,7 @@ chk_conf_tag () {
 }
 
 
-# Check for CARNet ModSecurity configuration file.
+# Check for CARNET ModSecurity configuration file.
 #
 chk_conf_tag "$MODSECCONF"
 if [ $RET -eq 0 ] || [ $RET -eq 1 ]; then

diff --git a/debian/control b/debian/control
index 648c0dc..70591be 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,18 @@
 Source: mod-security-cn
 Section: httpd
 Priority: optional
-Maintainer: Ivan Rako <Ivan.Rako@CARNet.hr>
-Build-Depends: debhelper (>> 9), po-debconf
+Maintainer: Ivan Rako <Ivan.Rako@CARNET.hr>
+Build-Depends: debhelper (>> 10), po-debconf
 Standards-Version: 3.9.8
 Homepage: http://www.modsecurity.org/
 
 Package: mod-security-cn
 Architecture: all
-Pre-Depends: libapache2-mod-security2 (>= 2.9.1-2)
-Depends: carnet-tools-cn (>= 3.2.1), ${misc:Depends}
+Pre-Depends: libapache2-mod-security2 (>= 2.9.3)
+Depends: carnet-tools-cn (>= 3.3.0), ${misc:Depends}
 Description: Tighten web applications security for Apache
  Modsecurity is an Apache module whose purpose is to tighten the Web
  application security. Effectively, it is an intrusion detection and prevention
  system for the web server.
  .
- This package contains additional CARNet configuration.
+ This dummy package contains additional CARNet configuration.

diff --git a/debian/docs b/debian/docs
index 8f6e250..db3c4b3 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README.CARNet
+README.CARNET

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index f02bda6..bc03005 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the mod-security-cn package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mod-security-cn\n"
 "Report-Msgid-Bugs-To: mod-security-cn@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-03 16:39+0200\n"
+"POT-Creation-Date: 2020-11-11 23:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,7 +31,7 @@ msgid ""
 "web posluzitelju nalazi na RBL (Realtime Blackhole List) listi.  U slucaju "
 "da se adresa nalazi na RBL listi, sa doticne adrese nece se moci pristupiti "
 "Vasem web posluzitelju.  RBL provjera se preskace za adrese koje su iz "
-"CARNetove mreze.  Ova funkcionalnost je slicna onoj koju ima Postfix MTA."
+"CARNETove mreze.  Ova funkcionalnost je slicna onoj koju ima Postfix MTA."
 msgstr ""
 
 #. Type: boolean
@@ -44,8 +44,8 @@ msgstr ""
 #. Description
 #: ../templates:1001
 msgid ""
-"VAZNO:  Zbog licencnih razloga pristup CARNetovom RBL posluzitelju je "
-"dopusten samo iz CARNetove mreze (161.53.0.0/16, 193.198.0.0/16, "
+"VAZNO:  Zbog licencnih razloga pristup CARNETovom RBL posluzitelju je "
+"dopusten samo iz CARNETove mreze (161.53.0.0/16, 193.198.0.0/16, "
 "192.84.91.0/24, 192.84.92.0/24, 192.84.105.0/24, 192.84.106.0/24, "
 "31.147.0.0/16, 82.132.0.0/17 i 2001:b68::/32)."
 msgstr ""

diff --git a/debian/postinst b/debian/postinst
index 24ab874..3a21ffd 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,7 +8,7 @@ set -e
 # Load Debconf
 . /usr/share/debconf/confmodule
 
-# Load CARNet Tools
+# Load CARNET Tools
 . /usr/share/carnet-tools/functions.sh
 
 PKG="mod-security-cn"
@@ -56,7 +56,7 @@ cleanup () {
 
 # chk_conf_tag ()
 #
-#   Check if configuration file has CARNet package info lines.
+#   Check if configuration file has CARNET package info lines.
 #   return:  $RET => 0 - tagged
 #                    1 - file does not exists
 #                    2 - file exists, but it is not tagged
@@ -67,7 +67,7 @@ chk_conf_tag () {
   RET=1
 
   if [ -f "$conf_file" ]; then
-    if egrep -q "^## Begin - Generated by CARNet package mod-security-cn$" "$conf_file"; then
+    if egrep -q "^## Begin - Generated by CARNET package mod-security-cn$" "$conf_file"; then
       RET=0
     else
       RET=2

diff --git a/debian/postrm b/debian/postrm
index 83e5d86..960d309 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -11,7 +11,7 @@ MODSECLNK=/etc/apache2/conf-available/security2-cn.conf
 
 # chk_conf_tag ()
 #
-#   Check if configuration file has CARNet package info lines.
+#   Check if configuration file has CARNET package info lines.
 #   return:  $RET => 0 - tagged
 #                    1 - file does not exists
 #                    2 - file exists, but it is not tagged
@@ -22,7 +22,7 @@ chk_conf_tag () {
   RET=1
 
   if [ -f "$conf_file" ]; then
-    if egrep -q "^## Begin - Generated by CARNet package mod-security-cn$" "$conf_file"; then
+    if egrep -q "^## Begin - Generated by CARNET package mod-security-cn$" "$conf_file"; then
       RET=0
     else
       RET=2

diff --git a/debian/prerm b/debian/prerm
index 2a26bb4..2acd7c1 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -10,7 +10,7 @@ MODSECLNK=/etc/apache2/conf-available/security2-cn.conf
 
 # chk_conf_tag ()
 #
-#   Check if configuration file has CARNet package info lines.
+#   Check if configuration file has CARNET package info lines.
 #   return:  $RET => 0 - tagged
 #                    1 - file does not exists
 #                    2 - file exists, but it is not tagged
@@ -21,7 +21,7 @@ chk_conf_tag () {
   RET=1
 
   if [ -f "$conf_file" ]; then
-    if egrep -q "^## Begin - Generated by CARNet package mod-security-cn$" "$conf_file"; then
+    if egrep -q "^## Begin - Generated by CARNET package mod-security-cn$" "$conf_file"; then
       RET=0
     else
       RET=2
@@ -55,7 +55,7 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     rm -f "$MODSECLNK"
   fi
 
-  # Remove configuration files generated by this CARNet package.
+  # Remove configuration files generated by this CARNET package.
   for mfile in "$MODSECCONF" "$MODSECRBL"; do
     chk_conf_tag "$mfile"
     if [ $RET -eq 0 ]; then

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0

diff --git a/debian/templates b/debian/templates
index d49362a..8107329 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -6,12 +6,12 @@ _Description: Zelite li aktivirati RBL?
  Vasem web posluzitelju nalazi na RBL (Realtime Blackhole List)
  listi.  U slucaju da se adresa nalazi na RBL listi, sa doticne adrese
  nece se moci pristupiti Vasem web posluzitelju.  RBL provjera se
- preskace za adrese koje su iz CARNetove mreze.  Ova funkcionalnost
+ preskace za adrese koje su iz CARNETove mreze.  Ova funkcionalnost
  je slicna onoj koju ima Postfix MTA.
  .
  RBL posluzitelj koji se koristi za provjeru je xbl.dnsbl-sh.carnet.hr.
  .
- VAZNO:  Zbog licencnih razloga pristup CARNetovom RBL posluzitelju je
- dopusten samo iz CARNetove mreze (161.53.0.0/16, 193.198.0.0/16,
+ VAZNO:  Zbog licencnih razloga pristup CARNETovom RBL posluzitelju je
+ dopusten samo iz CARNETove mreze (161.53.0.0/16, 193.198.0.0/16,
  192.84.91.0/24, 192.84.92.0/24, 192.84.105.0/24, 192.84.106.0/24,
  31.147.0.0/16, 82.132.0.0/17 i 2001:b68::/32).

diff --git a/mod-security-cn.conf b/mod-security-cn.conf
index 9d2aa0d..9d6eaf8 100644 (file)
--- a/mod-security-cn.conf
+++ b/mod-security-cn.conf
@@ -1,9 +1,9 @@
-## Begin - Generated by CARNet package mod-security-cn
+## Begin - Generated by CARNET package mod-security-cn
 #
 #  REMOVE this whole block if you DON'T WANT mod-security-cn
 #  to edit your configuration file.
 #
-## End - Generated by CARNet package mod-security-cn
+## End - Generated by CARNET package mod-security-cn
 
 <IfModule security2_module>
 

diff --git a/rbl_lookup.conf b/rbl_lookup.conf
index c72016e..5fa2dde 100644 (file)
--- a/rbl_lookup.conf
+++ b/rbl_lookup.conf
@@ -1,9 +1,9 @@
-## Begin - Generated by CARNet package mod-security-cn
+## Begin - Generated by CARNET package mod-security-cn
 #
 #  REMOVE this whole block if you DON'T WANT mod-security-cn
 #  to edit your configuration file.
 #
-## End - Generated by CARNet package mod-security-cn
+## End - Generated by CARNET package mod-security-cn
 
 <IfModule security2_module>