[pkg-bacula-commits] [bacula] 03/03: Dropped debian patches upstream-bring-back-tmpfiles-configuration.patch, upstream-fix-sqlite-db-creation.patch and upstream-fix-sqlite-update.patch, these have been addressed or applied in the new upstream version
Carsten Leonhardt
leo at moszumanska.debian.org
Wed Sep 6 22:44:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to branch master
in repository bacula.
commit 6b412c807889e2795c0289db5b5c1450de97b17e
Author: Carsten Leonhardt <leo at debian.org>
Date: Thu Sep 7 00:43:23 2017 +0200
Dropped debian patches
upstream-bring-back-tmpfiles-configuration.patch,
upstream-fix-sqlite-db-creation.patch and
upstream-fix-sqlite-update.patch, these have been addressed or applied
in the new upstream version
---
debian/changelog | 7 +-
debian/patches/series | 3 -
...pstream-bring-back-tmpfiles-configuration.patch | 18 ----
.../patches/upstream-fix-sqlite-db-creation.patch | 79 ----------------
debian/patches/upstream-fix-sqlite-update.patch | 102 ---------------------
5 files changed, 5 insertions(+), 204 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7d55871..79f3fe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ bacula (9.0.4+dfsg-1) unstable; urgency=low
* Fixed default config for bacula-sd so it listens only on localhost
* Added notice about discontinued sqlite3 support also to the package
description of bacula-common-sqlite3
- * Another fix to upstream-fix-sqlite-update.patch, thanks to Martin on
- upstream's bug tracker for pointing it out
+ * Dropped debian patches
+ upstream-bring-back-tmpfiles-configuration.patch,
+ upstream-fix-sqlite-db-creation.patch and
+ upstream-fix-sqlite-update.patch, these have been addressed or applied
+ in the new upstream version
* Added patches to modify the baculabackupreport script to use sensible
defaults
diff --git a/debian/patches/series b/debian/patches/series
index a282c6e..fc1990c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,8 +8,5 @@ debian-fix-libbaccats-rpath.patch
debian-fix-paths-examples-devices.patch
debian-enable-hardening-for-bat.patch
non-forking-systemd-units.patch
-upstream-bring-back-tmpfiles-configuration.patch
-upstream-fix-sqlite-update.patch
-upstream-fix-sqlite-db-creation.patch
upstream-fix-baculabackupreport-defaults.patch
debian-fix-baculabackupreport-defaults.patch
diff --git a/debian/patches/upstream-bring-back-tmpfiles-configuration.patch b/debian/patches/upstream-bring-back-tmpfiles-configuration.patch
deleted file mode 100644
index 85fabd0..0000000
--- a/debian/patches/upstream-bring-back-tmpfiles-configuration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Bring back tmpfiles.d/bacula.conf
- The configuration for tmpfiles.d, creating /var/run/bacula, was
- lost upstream between 7.4.7 and 9.0.0 during a backport from
- Bacula Enterprise.
-Author: Sven Hartge <sven at svenhartge.de>
-Bug: http://bugs.bacula.org/view.php?id=2307
-Last-Update: 2017-08-15
-
---- a/autoconf/configure.in
-+++ b/autoconf/configure.in
-@@ -3325,6 +3325,7 @@
-
- PFILES="${PFILES} \
- platforms/systemd/Makefile \
-+ platforms/systemd/bacula.conf \
- platforms/systemd/bacula-dir.service \
- platforms/systemd/bacula-fd.service \
- platforms/systemd/bacula-sd.service"
diff --git a/debian/patches/upstream-fix-sqlite-db-creation.patch b/debian/patches/upstream-fix-sqlite-db-creation.patch
deleted file mode 100644
index 6750c06..0000000
--- a/debian/patches/upstream-fix-sqlite-db-creation.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Fix sqlite3 database creation script
-Author: Carsten Leonhardt <leo at debian.org>
-Bug: http://bugs.bacula.org/view.php?id=2305
-Last-Update: 2017-08-29
---- a/src/cats/make_sqlite3_tables.in
-+++ b/src/cats/make_sqlite3_tables.in
-@@ -175,6 +175,8 @@
- PRIMARY KEY(FileSetId)
- );
-
-+CREATE INDEX fileset_name_idx on FileSet (FileSet);
-+
- CREATE TABLE JobMedia (
- JobMediaId INTEGER,
- JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-@@ -214,8 +216,8 @@
- VolHoleBytes BIGINT UNSIGNED DEFAULT 0,
- VolHoles INTEGER UNSIGNED DEFAULT 0,
- VolType INTEGER UNSIGNED DEFAULT 0,
-- VolParts INTERGER UNSIGNED DEFAULT 0,
-- VolCloudParts INTERGER UNSIGNED DEFAULT 0,
-+ VolParts INTEGER UNSIGNED DEFAULT 0,
-+ VolCloudParts INTEGER UNSIGNED DEFAULT 0,
- VolErrors INTEGER UNSIGNED DEFAULT 0,
- VolWrites BIGINT UNSIGNED DEFAULT 0,
- VolCapacityBytes BIGINT UNSIGNED DEFAULT 0,
-@@ -246,6 +248,7 @@
- PRIMARY KEY(MediaId)
- );
-
-+CREATE UNIQUE INDEX Media_Volumename_Id ON Media (VolumeName);
- CREATE INDEX inx8 ON Media (PoolId);
- CREATE INDEX inx9 ON Media (StorageId);
-
-@@ -315,6 +318,7 @@
- PRIMARY KEY (PoolId)
- );
-
-+CREATE INDEX pool_name_idx on Pool (Name);
-
- CREATE TABLE Client (
- ClientId INTEGER,
-@@ -327,6 +331,8 @@
- PRIMARY KEY(ClientId)
- );
-
-+CREATE UNIQUE INDEX client_name_idx on Client (Name);
-+
- CREATE TABLE BaseFiles (
- BaseId BIGINT,
- BaseJobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-@@ -346,18 +352,6 @@
- PRIMARY KEY (UnsavedId)
- );
-
--
--CREATE TABLE NextId (
-- id INTEGER UNSIGNED DEFAULT 0,
-- TableName TEXT NOT NULL,
-- PRIMARY KEY (TableName)
-- );
--
--
--
---- Initialize JobId to start at 1
--INSERT INTO NextId (id, TableName) VALUES (1, 'Job');
--
- CREATE TABLE Version (
- VersionId INTEGER UNSIGNED NOT NULL
- );
-@@ -472,7 +466,7 @@
- ('I', 'Incomplete Job',25);
-
- -- Initialize Version
--INSERT INTO Version (VersionId) VALUES (15);
-+INSERT INTO Version (VersionId) VALUES (16);
-
- PRAGMA default_cache_size = 100000;
- PRAGMA synchronous = NORMAL;
diff --git a/debian/patches/upstream-fix-sqlite-update.patch b/debian/patches/upstream-fix-sqlite-update.patch
deleted file mode 100644
index 0ad4bdb..0000000
--- a/debian/patches/upstream-fix-sqlite-update.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Description: Fix sqlite3 update script
-Author: Carsten Leonhardt <leo at debian.org>
-Bug: http://bugs.bacula.org/view.php?id=2306
-Last-Update: 2017-08-25
---- a/src/cats/update_sqlite3_tables.in
-+++ b/src/cats/update_sqlite3_tables.in
-@@ -156,10 +156,15 @@
- CREATE INDEX jobtdate_idx on JobHisto (JobTDate);
-
- UPDATE Version SET VersionId=15;
-+commit;
-+END-OF-DATA
-
-+DBVERSION=15
-+
-+fi
-
- if [ "$DBVERSION" -eq 15 ] ; then
-- if psql -f - -d ${db_name} $* <<END-OF-DATA
-+ sqlite3 $* ${db_name}.db <<END-OF-DATA
- begin;
- CREATE TABLE basefiles_temp (
- BaseId BIGINT,
-@@ -178,10 +183,65 @@
- DROP TABLE BaseFiles;
- ALTER TABLE basefiles_temp RENAME TO BaseFiles;
-
--ALTER TABLE Media RENAME COLUMN VolParts TO VolType;
--ALTER TABLE Media ADD COLUMN VolParts INTEGER DEFAULT 0;
--ALTER TABLE Media ADD COLUMN LastPartBytes BIGINT DEFAULT 0;
--ALTER TABLE Media ADD COLUMN CacheRetention BIGINT DEFAULT 0;
-+CREATE TABLE Media_tmp (
-+ MediaId INTEGER,
-+ VolumeName VARCHAR(128) NOT NULL,
-+ Slot INTEGER DEFAULT 0,
-+ PoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-+ MediaType VARCHAR(128) NOT NULL,
-+ MediaTypeId INTEGER UNSIGNED REFERENCES MediaType DEFAULT 0,
-+ LabelType TINYINT DEFAULT 0,
-+ FirstWritten DATETIME DEFAULT 0,
-+ LastWritten DATETIME DEFAULT 0,
-+ LabelDate DATETIME DEFAULT 0,
-+ VolJobs INTEGER UNSIGNED DEFAULT 0,
-+ VolFiles INTEGER UNSIGNED DEFAULT 0,
-+ VolBlocks INTEGER UNSIGNED DEFAULT 0,
-+ LastPartBytes BIGINT UNSIGNED DEFAULT 0,
-+ VolMounts INTEGER UNSIGNED DEFAULT 0,
-+ VolBytes BIGINT UNSIGNED DEFAULT 0,
-+ VolABytes BIGINT UNSIGNED DEFAULT 0,
-+ VolAPadding BIGINT UNSIGNED DEFAULT 0,
-+ VolHoleBytes BIGINT UNSIGNED DEFAULT 0,
-+ VolHoles INTEGER UNSIGNED DEFAULT 0,
-+ VolType INTEGER UNSIGNED DEFAULT 0,
-+ VolParts INTERGER UNSIGNED DEFAULT 0,
-+ VolCloudParts INTERGER UNSIGNED DEFAULT 0,
-+ VolErrors INTEGER UNSIGNED DEFAULT 0,
-+ VolWrites BIGINT UNSIGNED DEFAULT 0,
-+ VolCapacityBytes BIGINT UNSIGNED DEFAULT 0,
-+ VolStatus VARCHAR(20) NOT NULL,
-+ Enabled TINYINT DEFAULT 1,
-+ Recycle TINYINT DEFAULT 0,
-+ ActionOnPurge TINYINT DEFAULT 0,
-+ CacheRetention BIGINT UNSIGNED DEFAULT 0,
-+ VolRetention BIGINT UNSIGNED DEFAULT 0,
-+ VolUseDuration BIGINT UNSIGNED DEFAULT 0,
-+ MaxVolJobs INTEGER UNSIGNED DEFAULT 0,
-+ MaxVolFiles INTEGER UNSIGNED DEFAULT 0,
-+ MaxVolBytes BIGINT UNSIGNED DEFAULT 0,
-+ InChanger TINYINT DEFAULT 0,
-+ StorageId INTEGER UNSIGNED REFERENCES Storage DEFAULT 0,
-+ DeviceId INTEGER UNSIGNED REFERENCES Device DEFAULT 0,
-+ MediaAddressing TINYINT DEFAULT 0,
-+ VolReadTime BIGINT UNSIGNED DEFAULT 0,
-+ VolWriteTime BIGINT UNSIGNED DEFAULT 0,
-+ EndFile INTEGER UNSIGNED DEFAULT 0,
-+ EndBlock INTEGER UNSIGNED DEFAULT 0,
-+ LocationId INTEGER UNSIGNED REFERENCES Location DEFAULT 0,
-+ RecycleCount INTEGER UNSIGNED DEFAULT 0,
-+ InitialWrite DATETIME DEFAULT 0,
-+ ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-+ RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-+ Comment TEXT,
-+ PRIMARY KEY(MediaId)
-+ );
-+INSERT INTO Media_tmp (MediaId, VolumeName, Slot, PoolId, MediaType, MediaTypeId, LabelType, FirstWritten, LastWritten, LabelDate, VolJobs, VolFiles, VolBlocks, VolMounts, VolBytes, VolType, VolErrors, VolWrites, VolCapacityBytes, VolStatus, Enabled, Recycle, ActionOnPurge, VolRetention, VolUseDuration, MaxVolJobs, MaxVolFiles, MaxVolBytes, InChanger, StorageId, DeviceId, MediaAddressing, VolReadTime, VolWriteTime, EndFile, EndBlock, LocationId, RecycleCount, InitialWrite, ScratchPoolId [...]
-+DROP TABLE Media;
-+ALTER TABLE Media_tmp RENAME TO Media;
-+CREATE INDEX inx8 ON Media (PoolId);
-+CREATE INDEX inx9 ON Media (StorageId);
-+
- ALTER TABLE Pool ADD COLUMN CacheRetention BIGINT DEFAULT 0;
- CREATE INDEX job_jobtdate_inx ON job (JobTDate);
-
-@@ -196,8 +256,3 @@
- exit 1
- fi
- fi
--
--COMMIT;
--END-OF-DATA
--DBVERSION=16
--fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list