Prva inačica za buster

diff --git a/README.CARNet b/README.CARNET
similarity index 100%
rename from README.CARNet
rename to README.CARNET

diff --git a/debian/changelog b/debian/changelog
index 22c3336..2723fdf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,177 +1,6 @@
-mysql-cn (2:5.5.9999) stable; urgency=low
+mariadb-cn (10.1.45+cn10u1) stable; urgency=low

 
 

-  * Prva inacica za stretch
-  * Ovisnost o MariaDB, odnosno o paketima default-mysql-{client,server}
+  * Prva inačica za CARNET Debian 10 (buster)
+  * Ovisnost o init-system-helpers

 
 

- -- Zeljko Boros <Zeljko.Boros@CARNet.hr> Fri, 10 May 2019 15:19:09 +0200 
-
-mysql-cn (2:5.5.50.1) stable; urgency=low
-
-  * Prva inacica za jessie
-
- -- Zeljko Boros <Zeljko.Boros@CARNet.hr>  Wed, 07 Sep 2016 12:17:39 +0200
-
-mysql-cn (2:5.5.31.1) stable; urgency=low
-
-  * Prva inacica paketa za izdanje wheezy
-  * Non-maintainer upload.
-
- -- Zeljko Boros <Zeljko.Boros@CARNet.hr>  Mon, 28 Oct 2013 14:10:48 +0100
-
-mysql-cn (2:5.1.49.2) stable; urgency=low
-
-  * Izmjene za lintian
-  * Iskljuceje zastarjele opcije skip-bdb i skip-networking
-
- -- Ivan Rako <Ivan.Rako@CARNet.hr>  Fri, 27 Apr 2012 17:31:40 +0200
-
-mysql-cn (2:5.1.49-1) stable; urgency=low
-
-  * Prva verzija za squeeze
-
- -- Ivan Rako <Ivan.Rako@CARNet.hr>  Wed, 13 Apr 2011 14:50:52 +0200
-
-mysql-cn (2:5.0.51-2lenny1) stable; urgency=low
-
-  * Prva verzija za lenny
-
- -- Ivan Rako <Ivan.Rako@CARNet.hr>  Fri, 24 Apr 2009 13:06:25 +0200
-
-mysql-cn (2:5.0.51-1) stable; urgency=low
-
-  * Ovisnost o verziji sa backports.org
-  * Tranzicijski paket za buduci prelazak na Lenny
-
- -- Ivan Rako <Ivan.Rako@CARNet.hr>  Sun, 14 Dec 2008 22:37:29 +0100
-
-mysql-cn (2:5.0.32-1) stable; urgency=low
-
-  * izdanje paketa za Etch
-  * prva verzija sa source paketom
-
- -- Ivan Rako <Ivan.Rako@CARNet.hr>  Sat,  8 Sep 2007 21:43:34 +0200
-
-mysql-cn (2:4.0.24-10.5) sarge; urgency=low
-
-  * Dodana provjera da li postoji lozinka zapisana u konfiguracijskoj
-    datoteci, ako postoji, ne mijenja lozinku
-  * Maknut 'unset CP_ECHO_RETURN'
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Sat, 12 Nov 2005 20:14:29 +0100
-
-mysql-cn (2:4.0.24-10.4) sarge; urgency=low
-
-  * Dodana baza kao argument kod provjere administratorske lozinke
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Mon, 31 Oct 2005 21:10:20 +0100
-
-mysql-cn (2:4.0.24-10.3) sarge; urgency=low
-
-  * verzija u Depends postavljena na najnovije sigurnosno izdanje
-    koja ispravlja problem unutar funkcije init_syms  (CAN-2005-2558
-    i DSA 829-1)
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Mon,  3 Oct 2005 08:54:42 +0200
-
-mysql-cn (2:4.0.24-10.2) sarge; urgency=low
-
-  * dodana ovisnost o mail-transport-agent
-  * ispravljena sintaksa u changelogu
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Mon,  5 Sep 2005 14:32:02 +0200
-
-mysql-cn (2:4.0.24-10.1) sarge; urgency=medium
-
-  * dodana ovisnost o carnet-tools-cn
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Tue, 28 Jun 2005 13:40:53 +0200
-
-mysql-cn (2:4.0.24-10) sarge; urgency=medium
-
-  * postavlja administratorsku lozinku ako ne postoji
-  * kozmetika maintainer skripti
-  * koristenje CARNet toolsa
-  * restarta MySQL samo ako se mjenja konfiguracijska datoteka
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Wed, 25 May 2005 21:20:24 +0200
-
-mysql-cn (2:4.0.24-5) sarge; urgency=high
-
-  * verzija u Depends postavljena na najnovije sigurnosno izdanje:
-      - CAN-2004-0957
-      - CAN-2005-0709
-      - CAN-2005-0710
-      - CAN-2005-0711
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Wed, 13 Apr 2005 18:41:04 +0200
-
-mysql-cn (2:4.0.24-2.2) sarge; urgency=high
-
-  * koristenje grep -q u postinstu
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Sun, 27 Mar 2005 14:10:27 +0200
-
-mysql-cn (2:4.0.24-2.1) sarge; urgency=high
-
-  * krive dozvole nad datotekama u DEBIAN/
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Tue, 22 Mar 2005 15:57:46 +0100
-
-mysql-cn (2:4.0.24-2) sarge; urgency=high
-
-  * kozmetika postinsta
-  * verzija u Depends postavljena na najnovije sigurnosno izdanje:
-      - CAN-2005-XXX (temporary file creation with "CREATE TEMPORARY TABLE")
-      - CAN-2005-XXX (arbitrary library injection in udf_init())
-      - CAN-2005-XXX (arbitrary code execution via "CREATE FUNCTION")
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Tue, 15 Mar 2005 15:08:53 +0100
-
-mysql-cn (2:4.0.23-3) sarge; urgency=high
-
-  * verzija u Depends postavljena na najnovije sigurnosno izdanje
-    (DSA 647-1 i CAN-2005-0004)
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Wed, 19 Jan 2005 13:35:16 +0100
-
-mysql-cn (2:4.0.22-2) stable; urgency=high
-
-  * iskljuceno logiranje u /var/log/mysql/mysql.log zbog velike
-    kolicine logova koje proizvodi prelude-manager
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Thu, 16 Dec 2004 00:26:28 +0100
-
-mysql-cn (2:4.0.22-1) stable; urgency=high
-
-  * dodan ispravan croat.conf i win1250.conf
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Mon,  6 Dec 2004 20:28:39 +0100
-
-mysql-cn (2:4.0.21-1) stable; urgency=high
-
-  * kozmetika postinsta
-  * verzija u Depends postavljena na najnovije sigurnosno izdanje
-    (DSA 562-1, CAN-2004-0835, CAN-2004-0836 i CAN-2004-0837)
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Mon, 11 Oct 2004 21:04:53 +0200
-
-mysql-cn (2:4.0.20-11) stable; urgency=high
-
-  * verzija u Depends postavljena na najnovije sigurnosno izdanje
-   (DSA 540-1 i CAN-2004-0457)
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Fri, 20 Aug 2004 11:00:06 +0200
-
-mysql-cn (2:4.0.18-6) stable; urgency=high
-
-  * verzija koja ispravlja sigurnosne greske (CAN-2004-0381 i CAN-2004-0388)
-  * kozmeticke promjene u postinstu
-  * /usr/local/doc -> /usr/share/doc
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Sun, 18 Apr 2004 11:36:54 +0200
-
-mysql-cn (2:4.0.16-2)
-
-  * inicijalna verzija paketa
-
- -- Ivan 'ico' Rako <irako@srce.hr>  Thu, 20 Nov 2003 19:29:17 +0100
+ -- Zeljko Boros <Zeljko.Boros@carnet.hr>  Fri, 28 Aug 2020 13:39:22 +0200

diff --git a/debian/control b/debian/control
index 09b8fc3..d9f5e72 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: mysql-cn
+Source: mariadb-cn

 Section: net
 Priority: optional
 Maintainer: Grupa za izradu paketa <paketi@carnet.hr>
 Section: net
 Priority: optional
 Maintainer: Grupa za izradu paketa <paketi@carnet.hr>

@@ -6,11 +6,11 @@ Uploaders: Zeljko Boros <Zeljko.Boros@carnet.hr>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.8
 
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.8
 

-Package: mysql-cn
+Replaces: mysql-cn
+Provides: mysql-cn
+Conflicts: mysql-cn
+Package: mariadb-cn

 Architecture: all
 Architecture: all

-Depends: default-mysql-client (>= 1.0.2), default-mysql-server (>= 1.0.2), makepasswd, carnet-tools-cn (>= 3.1.0), ${misc:Depends}
-Description: MySQL database server
- MySQL is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MySQL are speed, robustness and
- ease of use.
+Depends: init-system-helpers (>= 1.56), default-mysql-client (>= 1.0.5), default-mysql-server (>= 1.0.5), makepasswd (>= 1.10-12), carnet-tools-cn (>= 3.3.0), ${misc:Depends}
+Description: MariaDB poslužitelj baza podataka
+ MariaDB je brz, multikorisnički i stabilni poslužitelj baza podataka.

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/postinst b/debian/postinst
index e959c3d..52a5f7a 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -48,7 +48,7 @@ if [ -z "$rootmycnf" ]; then
     if echo | mysql mysql 2> /dev/null; then
       mypwd="`makepasswd`"
       mysqladmin password $mypwd
     if echo | mysql mysql 2> /dev/null; then
       mypwd="`makepasswd`"
       mysqladmin password $mypwd

-      cp_echo "CN: Password for MySQL administrator (root@localhost) is: $mypwd"
+      cp_echo "CN: Zaporka za MariaDB administratora (root@localhost) je: $mypwd"

       cp_mail $PKG
     fi
   fi
       cp_mail $PKG
     fi
   fi

@@ -56,16 +56,18 @@ fi
 
 if su - nobody -c '[ -r ~root/.my.cnf ]' 2>&1 > /dev/null; then
   if grep -q "password.*=" ~root/.my.cnf; then
 
 if su - nobody -c '[ -r ~root/.my.cnf ]' 2>&1 > /dev/null; then
   if grep -q "password.*=" ~root/.my.cnf; then

-    echo "CN: WARNING: ~root/.my.cnf is world readable."
+    echo "CN: UPOZORENJE: datoteka ~root/.my.cnf je svima citljiva."

   fi
 fi
 
 [ "$restart" = "yes" ] || exit 0
 # restart mysql-a
   fi
 fi
 
 [ "$restart" = "yes" ] || exit 0
 # restart mysql-a

-if [ -x /usr/sbin/invoke-rc.d ]; then
-  [ -x /etc/init.d/mysql ] && invoke-rc.d mysql restart
-else
-  [ -x /etc/init.d/mysql ] && /etc/init.d/mysql restart
-fi
+#if [ -x /usr/sbin/invoke-rc.d ]; then
+#  [ -x /etc/init.d/mysql ] && invoke-rc.d mysql restart
+#else
+#  [ -x /etc/init.d/mysql ] && /etc/init.d/mysql restart
+#fi
+
+invoke-rc.d mysql restart

 
 #DEBHELPER#
 
 #DEBHELPER#