diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2016-12-04 14:50:56 +0100 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2016-12-04 15:07:52 +0100 |
commit | 5eebb2d08f9f13511c6d0a1b6f3efdf18077b58a (patch) | |
tree | b370428bbb8ebea9bee50c6026508dec025cca90 | |
parent | 381dcede14c1ad64e6734a8a6141cc56c9ade7d4 (diff) | |
download | alpine_aports-5eebb2d08f9f13511c6d0a1b6f3efdf18077b58a.tar.bz2 alpine_aports-5eebb2d08f9f13511c6d0a1b6f3efdf18077b58a.tar.xz alpine_aports-5eebb2d08f9f13511c6d0a1b6f3efdf18077b58a.zip |
main/backuppc: rewrite runscript and fix pidfile location
-rw-r--r-- | main/backuppc/APKBUILD | 10 | ||||
-rw-r--r-- | main/backuppc/backuppc.initd | 53 | ||||
-rw-r--r-- | main/backuppc/fix-pidfile-path.patch | 35 |
3 files changed, 58 insertions, 40 deletions
diff --git a/main/backuppc/APKBUILD b/main/backuppc/APKBUILD index 1f0d0bb37b..ebe849aaa0 100644 --- a/main/backuppc/APKBUILD +++ b/main/backuppc/APKBUILD | |||
@@ -16,6 +16,7 @@ install="$pkgname.pre-install" | |||
16 | source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$_realname-$pkgver.tar.gz | 16 | source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$_realname-$pkgver.tar.gz |
17 | configure.pl.patch | 17 | configure.pl.patch |
18 | remove-deprecated-perl-defined-at.patch | 18 | remove-deprecated-perl-defined-at.patch |
19 | fix-pidfile-path.patch | ||
19 | backuppc.initd" | 20 | backuppc.initd" |
20 | builddir="$srcdir/$_realname-$pkgver" | 21 | builddir="$srcdir/$_realname-$pkgver" |
21 | 22 | ||
@@ -73,12 +74,15 @@ package() { | |||
73 | md5sums="5efdcdd48e9e0d4ef7a706902d1f8b3d BackupPC-3.3.1.tar.gz | 74 | md5sums="5efdcdd48e9e0d4ef7a706902d1f8b3d BackupPC-3.3.1.tar.gz |
74 | 2a25b036d273ea67b69aa62e4cd7c28f configure.pl.patch | 75 | 2a25b036d273ea67b69aa62e4cd7c28f configure.pl.patch |
75 | eaff2abac13ea00427e9c895e0dc881c remove-deprecated-perl-defined-at.patch | 76 | eaff2abac13ea00427e9c895e0dc881c remove-deprecated-perl-defined-at.patch |
76 | f0e269be36032f47a7121dea03f69d55 backuppc.initd" | 77 | c95caf4db25e308defdcf6dae1662006 fix-pidfile-path.patch |
78 | 59aba6f5819ca9a620342a8678325794 backuppc.initd" | ||
77 | sha256sums="c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c BackupPC-3.3.1.tar.gz | 79 | sha256sums="c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c BackupPC-3.3.1.tar.gz |
78 | 86988fbe8e8763abee8861f5bb03bf6bb7fd2430623f78fc921502b6759ad48d configure.pl.patch | 80 | 86988fbe8e8763abee8861f5bb03bf6bb7fd2430623f78fc921502b6759ad48d configure.pl.patch |
79 | 202cb3b03bccd3f2af97db737e67ed8daf2a015ca0bb86b8908d8b5cee9ae9db remove-deprecated-perl-defined-at.patch | 81 | 202cb3b03bccd3f2af97db737e67ed8daf2a015ca0bb86b8908d8b5cee9ae9db remove-deprecated-perl-defined-at.patch |
80 | c466c91f064be2cf3d2ac991a70aee9fc5e19ea12014de0e98a090438cbb81ae backuppc.initd" | 82 | 6e5e33e0f30b8259ae097e2b5ede9b9864765b3bf4a30c85f37df5f929332c76 fix-pidfile-path.patch |
83 | 5d270ac3c4ed573a61836b0185eb2cac97116a86a5f65f593bf1c2a124f21867 backuppc.initd" | ||
81 | sha512sums="b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6 BackupPC-3.3.1.tar.gz | 84 | sha512sums="b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6 BackupPC-3.3.1.tar.gz |
82 | a38361fd0e54a4c0100a7bf94b09483e5ba246dc45d6955d275542dd5662d8da11d9580685195b7d4dfa9a07c0487a52a14a95340737e70889ffe5c5e26d5ff8 configure.pl.patch | 85 | a38361fd0e54a4c0100a7bf94b09483e5ba246dc45d6955d275542dd5662d8da11d9580685195b7d4dfa9a07c0487a52a14a95340737e70889ffe5c5e26d5ff8 configure.pl.patch |
83 | f834c223fd14db6401d0eb162d7794dcc9d040d397f914386769bc3dd82209078c6d0dc331ee1d8943a8ea07ad8c2975929511617b2cd85e85db4f5bbd5fff09 remove-deprecated-perl-defined-at.patch | 86 | f834c223fd14db6401d0eb162d7794dcc9d040d397f914386769bc3dd82209078c6d0dc331ee1d8943a8ea07ad8c2975929511617b2cd85e85db4f5bbd5fff09 remove-deprecated-perl-defined-at.patch |
84 | bb42e0b8524d6c53a39167985ce1bb42c5cb8c074963d3b270c1cff31db5aedc09b8eb27cd7aed7ccd8d27be0b40c43a59dcfbc0637755893af1f84874f67162 backuppc.initd" | 87 | 15fdb58e038160775fe4deebf6c8adbc128a37da2a866ef00e1eea202c396220cdd1c0547a45f11127dbdc957eaed5188cb87a05467d25647fb462be28c51ce7 fix-pidfile-path.patch |
88 | 288bba10ca4dd585638625321395e0a40aca30169a122c443f7c6fcd55143e6fcdfa5d39595bacf06cc4960b6e17992a57ec3d3a7ddd9b140e44da4ebdd019d3 backuppc.initd" | ||
diff --git a/main/backuppc/backuppc.initd b/main/backuppc/backuppc.initd index 6c43d9874b..751f04bf4e 100644 --- a/main/backuppc/backuppc.initd +++ b/main/backuppc/backuppc.initd | |||
@@ -1,47 +1,26 @@ | |||
1 | #!/sbin/openrc-run | 1 | #!/sbin/openrc-run |
2 | BACKUPPC_BINDIR=/usr/share/BackupPC/bin | ||
3 | DAEMON=BackupPC | ||
4 | BACKUPPC_LOGDIR=/var/log/BackupPC | ||
5 | USER=backuppc | ||
6 | |||
7 | depend() { | ||
8 | after firewall modules | ||
9 | } | ||
10 | 2 | ||
3 | extra_started_commands="reload" | ||
11 | 4 | ||
12 | configure () { | 5 | : ${user:="backuppc"} |
13 | chown $USER $BACKUPPC_LOGDIR | 6 | : ${logdir:="/var/log/BackupPC"} |
14 | chmod a+x $BACKUPPC_BINDIR/* | 7 | : ${command_args:="-d"} |
15 | test -x $BACKUPPC_BINDIR/$DAEMON || exit 0 | ||
16 | } | ||
17 | 8 | ||
18 | start() { | 9 | command="/usr/share/BackupPC/bin/BackupPC" |
19 | ebegin "Starting $DAEMON" | 10 | start_stop_daemon_args="--interpreted --user $user" |
20 | start-stop-daemon --start --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \ | 11 | pidfile="/run/BackupPC/BackupPC.pid" |
21 | --user $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d | 12 | retry="30" |
22 | eend $? | ||
23 | } | ||
24 | 13 | ||
25 | stop () { | 14 | depend() { |
26 | ebegin "Stopping $DAEMON" | 15 | after firewall modules |
27 | start-stop-daemon --stop --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \ | ||
28 | --retry 30 -x /usr/bin/perl | ||
29 | eend $? | ||
30 | } | 16 | } |
31 | 17 | ||
32 | restart () { | 18 | start_pre() { |
33 | start-stop-daemon --stop --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \ | 19 | checkpath -d -o $user -m 755 "${pidfile%/*}" |
34 | --retry 30 -x /usr/bin/perl | ||
35 | start-stop-daemon --start --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \ | ||
36 | --user $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d | ||
37 | } | 20 | } |
38 | 21 | ||
39 | reload () { | 22 | reload() { |
40 | start-stop-daemon --stop --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \ | 23 | ebegin "Reloading $name" |
41 | --signal 1 -x /usr/bin/perl | 24 | start-stop-daemon --signal 1 --pidfile "$pidfile" -x /usr/bin/perl |
25 | eend $? | ||
42 | } | 26 | } |
43 | |||
44 | |||
45 | |||
46 | |||
47 | |||
diff --git a/main/backuppc/fix-pidfile-path.patch b/main/backuppc/fix-pidfile-path.patch new file mode 100644 index 0000000000..ad76a53961 --- /dev/null +++ b/main/backuppc/fix-pidfile-path.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | --- a/bin/BackupPC | ||
2 | +++ b/bin/BackupPC | ||
3 | @@ -363,11 +363,11 @@ | ||
4 | # Write out our initial status and save our PID | ||
5 | # | ||
6 | StatusWrite(); | ||
7 | - unlink("$LogDir/BackupPC.pid"); | ||
8 | - if ( open(PID, ">", "$LogDir/BackupPC.pid") ) { | ||
9 | + unlink("/run/backuppc/BackupPC.pid"); | ||
10 | + if ( open(PID, ">", "/run/backuppc/BackupPC.pid") ) { | ||
11 | print(PID $$); | ||
12 | close(PID); | ||
13 | - chmod(0444, "$LogDir/BackupPC.pid"); | ||
14 | + chmod(0444, "/run/backuppc/BackupPC.pid"); | ||
15 | } | ||
16 | |||
17 | # | ||
18 | @@ -1846,7 +1846,7 @@ | ||
19 | close(LOG); | ||
20 | LogFileOpen(); | ||
21 | print(LOG "Fatal error: unhandled signal $SigName\n"); | ||
22 | - unlink("$LogDir/BackupPC.pid"); | ||
23 | + unlink("/run/backuppc/BackupPC.pid"); | ||
24 | confess("Got new signal $SigName... quitting\n"); | ||
25 | } else { | ||
26 | $SigName = shift; | ||
27 | @@ -1968,7 +1968,7 @@ | ||
28 | } | ||
29 | delete($Info{pid}); | ||
30 | StatusWrite(); | ||
31 | - unlink("$LogDir/BackupPC.pid"); | ||
32 | + unlink("/run/backuppc/BackupPC.pid"); | ||
33 | exit(1); | ||
34 | } | ||
35 | |||