From a68f3a312010af7197eb43b401cb602e827abee5 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Wed, 29 Jun 2016 15:15:36 +0200 Subject: [PATCH] Tweak remove unneeded .patch files in the cats directory --- bacula/src/cats/create_sqlite3_database.in.patch | 11 ----------- bacula/src/cats/grant_mysql_privileges.patch | 13 ------------- bacula/src/cats/make_catalog_backup.in.patch | 13 ------------- bacula/src/cats/update_sqlite3_tables.in.patch | 12 ------------ 4 files changed, 49 deletions(-) delete mode 100644 bacula/src/cats/create_sqlite3_database.in.patch delete mode 100644 bacula/src/cats/grant_mysql_privileges.patch delete mode 100644 bacula/src/cats/make_catalog_backup.in.patch delete mode 100644 bacula/src/cats/update_sqlite3_tables.in.patch diff --git a/bacula/src/cats/create_sqlite3_database.in.patch b/bacula/src/cats/create_sqlite3_database.in.patch deleted file mode 100644 index e9a38f4f75..0000000000 --- a/bacula/src/cats/create_sqlite3_database.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- create_sqlite3_database.in 2007-11-17 08:32:46.000000000 -0500 -+++ create_sqlite3_database.in.fixed 2007-11-17 08:35:00.000000000 -0500 -@@ -2,7 +2,7 @@ - # - # shell script to create Bacula SQLite tables - --bindir=@SQLITE_BINDIR@ -+bindir=/opt/bacula/sqlite - cd @working_dir@ - db_name=@db_name@ - diff --git a/bacula/src/cats/grant_mysql_privileges.patch b/bacula/src/cats/grant_mysql_privileges.patch deleted file mode 100644 index c529818926..0000000000 --- a/bacula/src/cats/grant_mysql_privileges.patch +++ /dev/null @@ -1,13 +0,0 @@ -10,13d9 -< grant all privileges on *.* to kern@localhost with grant option; -< grant all privileges on *.* to kern@"%" with grant option; -< grant all privileges on *.* to kelvin@localhost with grant option; -< grant all privileges on *.* to kelvin@"%" with grant option; -20c16 -< echo "Privileges for kern, kelvin, and bacula granted." ---- -> echo "MySQL privileges for bacula granted." -23c19 -< echo "Error creating privileges." ---- -> echo "Error creating MySQL privileges." diff --git a/bacula/src/cats/make_catalog_backup.in.patch b/bacula/src/cats/make_catalog_backup.in.patch deleted file mode 100644 index 46d18346f8..0000000000 --- a/bacula/src/cats/make_catalog_backup.in.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- make_catalog_backup.in 2006-12-09 10:17:05.000000000 -0500 -+++ make_catalog_backup.in.fixed 2006-12-09 10:24:40.000000000 -0500 -@@ -56,8 +56,7 @@ rm -f $1.sql - - case ${db_type} in - sqlite3) -- BINDIR=@SQLITE_BINDIR@ -- echo ".dump" | ${BINDIR}/sqlite3 $1.db >$1.sql -+ echo ".dump" | /opt/bacula/sqlite/sqlite3 $1.db >$1.sql - ;; - mysql) - BINDIR=@MYSQL_BINDIR@ - diff --git a/bacula/src/cats/update_sqlite3_tables.in.patch b/bacula/src/cats/update_sqlite3_tables.in.patch deleted file mode 100644 index 1a01855276..0000000000 --- a/bacula/src/cats/update_sqlite3_tables.in.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./update_sqlite3_tables.in 2010-01-25 02:56:28.000000000 -0500 -+++ ../../../bacula-5.0.0-fixed/src/cats/update_sqlite3_tables.in 2010-01-31 10:22:52.000000000 -0500 -@@ -9,7 +9,7 @@ echo " which is needed to convert from Bacula Enterprise version 2.6.x to 4.0.x" - echo " or Bacula Community version 5.0.x to 5.2.x" - echo " " - --bindir=@SQLITE_BINDIR@ -+bindir=/opt/bacula/sqlite - PATH="$bindir:$PATH" - cd @working_dir@ - db_name=@db_name@ - -- 2.39.5