diff options
author | Francesco Colista <fcolista@alpinelinux.org> | 2016-05-17 09:49:57 +0000 |
---|---|---|
committer | Francesco Colista <fcolista@alpinelinux.org> | 2016-05-17 09:50:02 +0000 |
commit | 5eef1ee2b6b7daba33b8a073d713fc9984023511 (patch) | |
tree | 0e0f2b34ef16188e861457ee1d3ca37aa756d6d2 | |
parent | 12a71a062a3ac848d457a0acca4347fb0eba7c88 (diff) | |
download | alpine_aports-5eef1ee2b6b7daba33b8a073d713fc9984023511.tar.bz2 alpine_aports-5eef1ee2b6b7daba33b8a073d713fc9984023511.tar.xz alpine_aports-5eef1ee2b6b7daba33b8a073d713fc9984023511.zip |
main/bacula: upgrade to 7.4.0
-rw-r--r-- | main/bacula/APKBUILD | 28 | ||||
-rw-r--r-- | main/bacula/bacula-7.4.0-path-mounted.patch | 15 |
2 files changed, 27 insertions, 16 deletions
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD index 2202e2b246..c9c05abdd2 100644 --- a/main/bacula/APKBUILD +++ b/main/bacula/APKBUILD | |||
@@ -1,16 +1,16 @@ | |||
1 | # Contributor: Łukasz Jendrysik <scadu@yandex.com> | 1 | # Contributor: Łukasz Jendrysik <scadu@yandex.com> |
2 | # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> | 2 | # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> |
3 | pkgname="bacula" | 3 | pkgname="bacula" |
4 | pkgver=7.0.5 | 4 | pkgver=7.4.0 |
5 | pkgrel=6 | 5 | pkgrel=0 |
6 | pkgdesc="Enterprise ready, network based backup program" | 6 | pkgdesc="Enterprise ready, network based backup program" |
7 | url="http://www.bacula.org" | 7 | url="http://www.bacula.org" |
8 | arch="all" | 8 | arch="all" |
9 | license="AGPL3" | 9 | license="AGPL3" |
10 | depends="" | 10 | depends="" |
11 | depends_dev="autoconf mariadb-dev ncurses-dev openssl-dev postgresql-dev sqlite-dev | 11 | depends_dev="" |
12 | zlib-dev lzo-dev" | 12 | makedepends="$depends_dev autoconf mariadb-dev ncurses-dev openssl-dev |
13 | makedepends="$depends_dev" | 13 | postgresql-dev sqlite-dev zlib-dev lzo-dev" |
14 | install="$pkgname.pre-install $pkgname.post-upgrade" | 14 | install="$pkgname.pre-install $pkgname.post-upgrade" |
15 | subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-sqlite" | 15 | subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-sqlite" |
16 | pkgusers="bacula" | 16 | pkgusers="bacula" |
@@ -23,8 +23,7 @@ source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgn | |||
23 | bacula-sd-conf | 23 | bacula-sd-conf |
24 | bacula-fd-init | 24 | bacula-fd-init |
25 | bacula-fd-conf | 25 | bacula-fd-conf |
26 | fix-headers.patch | 26 | bacula-7.4.0-path-mounted.patch |
27 | configure-detect-gcc.patch | ||
28 | " | 27 | " |
29 | 28 | ||
30 | _builddir="$srcdir/$pkgname-$pkgver" | 29 | _builddir="$srcdir/$pkgname-$pkgver" |
@@ -145,30 +144,27 @@ sqlite() { | |||
145 | _mv_backend sqlite3 | 144 | _mv_backend sqlite3 |
146 | } | 145 | } |
147 | 146 | ||
148 | md5sums="b4a99d673f5e1eaae8b257ccc610241f bacula-7.0.5.tar.gz | 147 | md5sums="c290c505b51699201cc5e0adea01f2e0 bacula-7.4.0.tar.gz |
149 | 3967099975a3eafe5811482b231b159f bacula-dir-init | 148 | 3967099975a3eafe5811482b231b159f bacula-dir-init |
150 | 20f28a16f34e3f20ed18ed81b010e765 bacula-dir-conf | 149 | 20f28a16f34e3f20ed18ed81b010e765 bacula-dir-conf |
151 | 5ae1fba6860a320394d65744e5640bdb bacula-sd-init | 150 | 5ae1fba6860a320394d65744e5640bdb bacula-sd-init |
152 | afe2f9a4d79d7d96eb9372d003d10f86 bacula-sd-conf | 151 | afe2f9a4d79d7d96eb9372d003d10f86 bacula-sd-conf |
153 | 6ae93e570f95fa845fa534c2d2efaac0 bacula-fd-init | 152 | 6ae93e570f95fa845fa534c2d2efaac0 bacula-fd-init |
154 | 4500ce2d62bf9df33c07f70dc40f7b85 bacula-fd-conf | 153 | 4500ce2d62bf9df33c07f70dc40f7b85 bacula-fd-conf |
155 | b84924f161f193d8441316ee4abc3064 fix-headers.patch | 154 | 2763b7e80d2adc63c75452c8bbfd14c9 bacula-7.4.0-path-mounted.patch" |
156 | 260871cf8415b6e6e3fa33d1103acffa configure-detect-gcc.patch" | 155 | sha256sums="fe850b783523edb19fb4dbfa8c44752d20955121b71a52b0740a9e765bfd73cb bacula-7.4.0.tar.gz |
157 | sha256sums="1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 bacula-7.0.5.tar.gz | ||
158 | 3dcba6d60dd2c67b1378a791d730588ff7d29eb59024fc731d4f4be01660e293 bacula-dir-init | 156 | 3dcba6d60dd2c67b1378a791d730588ff7d29eb59024fc731d4f4be01660e293 bacula-dir-init |
159 | 5891bdb3a8ec581f8a2fd404a5a8995d8950d80da71a3b732474fb45e80d22c2 bacula-dir-conf | 157 | 5891bdb3a8ec581f8a2fd404a5a8995d8950d80da71a3b732474fb45e80d22c2 bacula-dir-conf |
160 | 7c08606bbd391fa73773ef52bcee2dd989530c8c44b9dfae0b82cfe73976a400 bacula-sd-init | 158 | 7c08606bbd391fa73773ef52bcee2dd989530c8c44b9dfae0b82cfe73976a400 bacula-sd-init |
161 | 88808b3b971825acffc9dc3b6d418e52d9bd89df8527052c555cba4336ead784 bacula-sd-conf | 159 | 88808b3b971825acffc9dc3b6d418e52d9bd89df8527052c555cba4336ead784 bacula-sd-conf |
162 | 12a62dd9c7a7931060c2c21e52cb9069a3774ebe7c8370455068e2dded0c2f80 bacula-fd-init | 160 | 12a62dd9c7a7931060c2c21e52cb9069a3774ebe7c8370455068e2dded0c2f80 bacula-fd-init |
163 | 64124036c19e849cc580b981887be35b5746acb584397190a0afe2797b2d1ace bacula-fd-conf | 161 | 64124036c19e849cc580b981887be35b5746acb584397190a0afe2797b2d1ace bacula-fd-conf |
164 | f74d95cd0dab90326e0eeee45b30b4af52d61f9e8a16547ce879533d2e85d460 fix-headers.patch | 162 | 5262820ae14ebb5ffd09c719fb6c6366d15c3f73e3a82a3c71b8fda3e9f63f6a bacula-7.4.0-path-mounted.patch" |
165 | ecf64bf8ea837c0f54d157b7b4b2dd49209d2f78e5d74a3a03696073ffb4ba79 configure-detect-gcc.patch" | 163 | sha512sums="615cb4d9a4fd597bc794b6d4c901c777d544472f3f5b6e1cdc74d8e41279a3fd0bd6d2c30511095933a3a47a7f24da4372c538ab472eb48c0fb1db59c2a59e1a bacula-7.4.0.tar.gz |
166 | sha512sums="df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b bacula-7.0.5.tar.gz | ||
167 | 852df12c6555ad65661345e15872ca75b99a9d3e5b9e6ed80d82021006c9716a04919dabe88ff672aa550ac0b00b31eaa2e739469557fc326e6bb4216e2308b9 bacula-dir-init | 164 | 852df12c6555ad65661345e15872ca75b99a9d3e5b9e6ed80d82021006c9716a04919dabe88ff672aa550ac0b00b31eaa2e739469557fc326e6bb4216e2308b9 bacula-dir-init |
168 | e06e5f8821d4a9a3f40cc8f11feeb5004780b82e2ad5e645f69a0f8faff78d8a8c6e66b36e105619b2a78d6b2f294dedd0e00e9bbf568af201cf299387135fef bacula-dir-conf | 165 | e06e5f8821d4a9a3f40cc8f11feeb5004780b82e2ad5e645f69a0f8faff78d8a8c6e66b36e105619b2a78d6b2f294dedd0e00e9bbf568af201cf299387135fef bacula-dir-conf |
169 | ee8a9206d3e604f5ac81bc70bece97ec77dae87b463a6ff4d08fba9418bf37e99a30895f115b2e9fbba1ec5f92b5d9368fd155717fedae12792f255b02413208 bacula-sd-init | 166 | ee8a9206d3e604f5ac81bc70bece97ec77dae87b463a6ff4d08fba9418bf37e99a30895f115b2e9fbba1ec5f92b5d9368fd155717fedae12792f255b02413208 bacula-sd-init |
170 | 80f6cf74cc14e722747d92e6e7b073bdf32456d395c6b4b63daa1ddcaf75f3d76d1b9a0e8e2da512e8f82e4d59a4a93cc38117af91d974fe7db644516bdb9909 bacula-sd-conf | 167 | 80f6cf74cc14e722747d92e6e7b073bdf32456d395c6b4b63daa1ddcaf75f3d76d1b9a0e8e2da512e8f82e4d59a4a93cc38117af91d974fe7db644516bdb9909 bacula-sd-conf |
171 | e4c09734ccf9e1ac197ac4684c8294dddae817cf764b168ce7357b2529d11314f948ed2807d501b3c7cd7725ba488981fe573d7b389fca7feedfa9c8a1cce6fa bacula-fd-init | 168 | e4c09734ccf9e1ac197ac4684c8294dddae817cf764b168ce7357b2529d11314f948ed2807d501b3c7cd7725ba488981fe573d7b389fca7feedfa9c8a1cce6fa bacula-fd-init |
172 | ff312e8952b31de27f22b257d12b570e151794d985f854ff19bab34363ea974d7583edced6b125518da3ecfe2b2a229b732473958b10484d988fcc8a67a372cc bacula-fd-conf | 169 | ff312e8952b31de27f22b257d12b570e151794d985f854ff19bab34363ea974d7583edced6b125518da3ecfe2b2a229b732473958b10484d988fcc8a67a372cc bacula-fd-conf |
173 | 215a0b5bc038658ed821a85c6e70df70cb66ca2a970f1e27ae9690c54372410f2d677f1b04b380dfedcff516c96ba91200850917b20454a871a99958d0d24604 fix-headers.patch | 170 | 2d3757236aacca421261a8866ff04b5b0151538e1462559bd1240119b1bece1d456acbba9fee86dbc6aaec7af2a52eb2c0b7490c5f371b7deb478731c74342ff bacula-7.4.0-path-mounted.patch" |
174 | f6c0f79e270790d2f3564a76d58b6ce5b7b4348247ad31c782363e3a51604bc53d5b11b232469241ae59c1982f65fb5bbb744537a8b94a2bd2ce3395a57a344f configure-detect-gcc.patch" | ||
diff --git a/main/bacula/bacula-7.4.0-path-mounted.patch b/main/bacula/bacula-7.4.0-path-mounted.patch new file mode 100644 index 0000000000..659cd502b4 --- /dev/null +++ b/main/bacula/bacula-7.4.0-path-mounted.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | diff --git a/src/findlib/fstype.c b/src/findlib/fstype.c | ||
2 | index ab3b206..21f5754 100644 | ||
3 | --- a/src/findlib/fstype.c | ||
4 | +++ b/src/findlib/fstype.c | ||
5 | @@ -46,6 +46,10 @@ | ||
6 | |||
7 | #define is_rootfs(x) bstrcmp("rootfs", x) | ||
8 | |||
9 | +#ifndef _PATH_MOUNTED | ||
10 | +#define _PATH_MOUNTED "/proc/mounts" | ||
11 | +#endif /* _PATH_MOUNTED */ | ||
12 | + | ||
13 | #if defined(HAVE_GETMNTINFO) || defined(HAVE_GETMNTENT) | ||
14 | static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; | ||
15 | #endif | ||