[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/, app-backup/backuppc/files/4.4.0/

2024-05-27 Thread Sam James 
commit: 04f58b0a6b8ab2e71139f20ecbd76cd7673b40d7
Author: Dennis Eisele  dennis-eisele  de>
AuthorDate: Wed Apr  3 23:42:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 28 01:05:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f58b0a

app-backup/backuppc: add patch for erroneous config write

Signed-off-by: Dennis Eisele  dennis-eisele.de>
Closes: https://bugs.gentoo.org/888085
Closes: https://github.com/gentoo/gentoo/pull/36865
Signed-off-by: Sam James  gentoo.org>

 app-backup/backuppc/backuppc-4.4.0-r2.ebuild   | 195 +
 .../4.4.0/backuppc-4.4.0-fix-config-write.patch|  48 +
 2 files changed, 243 insertions(+)

diff --git a/app-backup/backuppc/backuppc-4.4.0-r2.ebuild 
b/app-backup/backuppc/backuppc-4.4.0-r2.ebuild
new file mode 100644
index ..f367192beefc
--- /dev/null
+++ b/app-backup/backuppc/backuppc-4.4.0-r2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="BackupPC-${PV}"
+MY_PN="BackupPC"
+
+inherit depend.apache systemd
+
+DESCRIPTION="High-performance backups to a server's disk"
+HOMEPAGE="https://backuppc.github.io/backuppc/index.html;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rss samba"
+
+DEPEND="
+   acct-group/backuppc
+   acct-user/backuppc
+   app-admin/apache-tools
+   app-admin/makepasswd
+   dev-lang/perl
+"
+
+# The CGI modules are handled in ${RDEPEND}.
+APACHE_MODULES="apache2_modules_alias," # RedirectMatch
+APACHE_MODULES+="apache2_modules_authn_core," # AuthType
+APACHE_MODULES+="apache2_modules_authz_core," # Require
+APACHE_MODULES+="apache2_modules_authz_host," # Require host
+APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
+
+# Older versions of mod_perl think they're compatible with apache-2.4,
+# so we require the new one explicitly.
+RDEPEND="
+   ${DEPEND}
+   app-arch/par2cmdline
+   dev-perl/Archive-Zip
+   dev-perl/CGI
+   dev-perl/File-RsyncP
+   dev-perl/libwww-perl
+   dev-perl/BackupPC-XS
+   net-misc/rsync-bpc
+   virtual/mta
+   virtual/perl-IO-Compress
+   www-apache/mod_perl
+   www-apache/mpm_itk
+   || (
+   >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+   >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+   )
+   rss? ( dev-perl/XML-RSS )
+   samba? ( net-fs/samba )"
+
+PATCHES=(
+   "${FILESDIR}/4.4.0/${P}-fix-config-write.patch" #888085
+)
+
+CGIDIR="${EROOT}/usr/lib/backuppc/htdocs"
+CONFDIR="${EROOT}/etc/${MY_PN}"
+DATADIR="${EROOT}/var/lib/backuppc"
+DOCDIR="${EROOT}/usr/share/doc/${PF}"
+LOGDIR="${EROOT}/var/log/BackupPC"
+need_apache2_4
+
+src_prepare() {
+   default
+   # Fix docs location using the marker that we've patched in.
+   sed "s+__DOCDIR__+${DOCDIR}+" -i lib/BackupPC/CGI/View.pm || die
+}
+
+src_install() {
+   local myconf
+   if use samba ; then
+   myconf=(
+   --bin-path smbclient=$(type -p smbclient)
+   --bin-path nmblookup=$(type -p nmblookup)
+   )
+   fi
+
+   /usr/bin/env perl ./configure.pl \
+   --batch \
+   --bin-path perl=$(type -p perl) \
+   --bin-path tar=$(type -p tar) \
+   --bin-path rsync=$(type -p rsync) \
+   --bin-path ping=$(type -p ping) \
+   --bin-path df=$(type -p df) \
+   --bin-path ssh=$(type -p ssh) \
+   --bin-path sendmail=$(type -p sendmail) \
+   --bin-path hostname=$(type -p hostname) \
+   --bin-path gzip=$(type -p gzip) \
+   --bin-path bzip2=$(type -p bzip2) \
+   --config-dir "${CONFDIR}" \
+   --install-dir /usr \
+   --data-dir "${DATADIR}" \
+   --hostname 127.0.0.1 \
+   --uid-ignore \
+   --dest-dir "${D}" \
+   --html-dir "${CGIDIR}"/image \
+   --html-dir-url /image \
+   --cgi-dir "${CGIDIR}" \
+   --fhs \
+   ${myconf[@]} || die "failed the configure.pl script"
+
+   ebegin "Installing documentation"
+
+   pod2man \
+   -errors=none \
+   --section=8 \
+   --center="BackupPC manual" \
+   "${S}"/doc/BackupPC.pod backuppc.8 \
+   || die "failed to generate man page"
+
+   doman backuppc.8
+
+   # Place the documentation in the correct location
+   dodoc "${ED}/usr/share/doc/BackupPC/BackupPC.html"
+   dodoc "${ED}/usr/share/doc/BackupPC/BackupPC.pod"
+   rm -rf "${ED}/usr/share/doc" || die
+
+   eend 0
+
+   # Setup directories
+   dodir "${CONFDIR}/pc"
+
+

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2024-05-27 Thread Joonas Niilola 
commit: 0079c90de7cc812c22fe712054b864ce53af59c7
Author: Dennis Eisele  dennis-eisele  de>
AuthorDate: Wed Apr  3 19:18:51 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 27 13:24:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0079c90d

app-backup/backuppc: add warning message

Signed-off-by: Dennis Eisele  dennis-eisele.de>
Bug: https://bugs.gentoo.org/878973
Closes: https://github.com/gentoo/gentoo/pull/36083
Signed-off-by: Joonas Niilola  gentoo.org>

 app-backup/backuppc/backuppc-4.4.0-r1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-backup/backuppc/backuppc-4.4.0-r1.ebuild 
b/app-backup/backuppc/backuppc-4.4.0-r1.ebuild
index 3d1f23482625..3e0e0aebb803 100644
--- a/app-backup/backuppc/backuppc-4.4.0-r1.ebuild
+++ b/app-backup/backuppc/backuppc-4.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -64,7 +64,6 @@ need_apache2_4
 
 src_prepare() {
default
-
# Fix docs location using the marker that we've patched in.
sed "s+__DOCDIR__+${DOCDIR}+" -i lib/BackupPC/CGI/View.pm || die
 }
@@ -145,6 +144,10 @@ src_install() {
 }
 
 pkg_postinst() {
+   ewarn "WARNING: The --one-file-system option was added to RsyncArgs."
+   ewarn "If you update from a prior version keep in mind that"
+   ewarn "this prevents data of mounted partitions from being updated."
+   ewarn
elog "Installation finished, you may now start using BackupPC."
elog
elog "- Read the documentation in 
${EROOT}/usr/share/doc/${PF}/BackupPC.html"

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2022-09-09 Thread Joonas Niilola 
commit: aec9a5a8a1e04a1b22e4ffdbdc2dd0eab7cd61d6
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Sep  9 06:20:06 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep  9 06:20:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec9a5a8

app-backup/backuppc: revbump 4.4.0 for the config patch changes

Signed-off-by: Joonas Niilola  gentoo.org>

 app-backup/backuppc/{backuppc-4.4.0.ebuild => backuppc-4.4.0-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-backup/backuppc/backuppc-4.4.0.ebuild 
b/app-backup/backuppc/backuppc-4.4.0-r1.ebuild
similarity index 100%
rename from app-backup/backuppc/backuppc-4.4.0.ebuild
rename to app-backup/backuppc/backuppc-4.4.0-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2022-09-09 Thread Joonas Niilola 
commit: 9f91bedde17217b2429ae2f9ed77060575aebe6e
Author: Dennis Eisele  dennis-eisele  de>
AuthorDate: Wed Aug 24 14:47:56 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep  9 06:20:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f91bedd

app-backup/backuppc: fix wrong config path from /etc to /etc/BackupPc

Closes: https://bugs.gentoo.org/866209
Signed-off-by: Dennis Eisele  dennis-eisele.de>
Closes: https://github.com/gentoo/gentoo/pull/27001
Signed-off-by: Joonas Niilola  gentoo.org>

 app-backup/backuppc/backuppc-4.4.0.ebuild | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-backup/backuppc/backuppc-4.4.0.ebuild 
b/app-backup/backuppc/backuppc-4.4.0.ebuild
index 08a7cffd4284..3d1f23482625 100644
--- a/app-backup/backuppc/backuppc-4.4.0.ebuild
+++ b/app-backup/backuppc/backuppc-4.4.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 MY_P="BackupPC-${PV}"
+MY_PN="BackupPC"
 
 inherit depend.apache systemd
 
@@ -54,11 +55,11 @@ RDEPEND="
rss? ( dev-perl/XML-RSS )
samba? ( net-fs/samba )"
 
-CGIDIR="/usr/lib/backuppc/htdocs"
-CONFDIR="${EROOT}/etc/${EPREFIX}"
-DATADIR="/var/lib/backuppc"
-DOCDIR="/usr/share/doc/${PF}"
-LOGDIR="/var/log/BackupPC"
+CGIDIR="${EROOT}/usr/lib/backuppc/htdocs"
+CONFDIR="${EROOT}/etc/${MY_PN}"
+DATADIR="${EROOT}/var/lib/backuppc"
+DOCDIR="${EROOT}/usr/share/doc/${PF}"
+LOGDIR="${EROOT}/var/log/BackupPC"
 need_apache2_4
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2022-08-16 Thread Joonas Niilola 
commit: 32c5992bc0fbbdd02ebfcde8b9ad949c658c031a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug 16 06:29:02 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 16 06:34:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c5992b

app-backup/backuppc: Stabilize 4.4.0 x86, #865335

Signed-off-by: Joonas Niilola  gentoo.org>

 app-backup/backuppc/backuppc-4.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/backuppc/backuppc-4.4.0.ebuild 
b/app-backup/backuppc/backuppc-4.4.0.ebuild
index 9cdff04fee51..9788237a8eb5 100644
--- a/app-backup/backuppc/backuppc-4.4.0.ebuild
+++ b/app-backup/backuppc/backuppc-4.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="rss samba"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2022-08-16 Thread Joonas Niilola 
commit: 3ee7548f77f24f43268aff7bbf99f711ceaf255e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug 16 06:34:19 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 16 06:34:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee7548f

app-backup/backuppc: Stabilize 4.4.0 amd64, #865335

Signed-off-by: Joonas Niilola  gentoo.org>

 app-backup/backuppc/backuppc-4.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/backuppc/backuppc-4.4.0.ebuild 
b/app-backup/backuppc/backuppc-4.4.0.ebuild
index 9788237a8eb5..08a7cffd4284 100644
--- a/app-backup/backuppc/backuppc-4.4.0.ebuild
+++ b/app-backup/backuppc/backuppc-4.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="rss samba"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2022-04-27 Thread Joonas Niilola 
commit: cbd818420edb0c5d99c85b8e0f34c3085e28b5ec
Author: Dennis Eisele  dennis-eisele  de>
AuthorDate: Wed Apr 27 13:58:32 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr 27 15:47:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd81842

app-backup/backuppc: update homepage

Closes: https://bugs.gentoo.org/841143
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Dennis Eisele  dennis-eisele.de>
Closes: https://github.com/gentoo/gentoo/pull/25225
Signed-off-by: Joonas Niilola  gentoo.org>

 app-backup/backuppc/backuppc-3.3.1-r6.ebuild | 4 ++--
 app-backup/backuppc/backuppc-4.4.0.ebuild| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
index 5d45affdb88d..3268596ed982 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ MY_P="BackupPC-${PV}"
 inherit depend.apache systemd
 
 DESCRIPTION="High-performance backups to a server's disk"
-HOMEPAGE="http://backuppc.sourceforge.net/;
+HOMEPAGE="https://backuppc.github.io/backuppc/index.html;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz;
 S="${WORKDIR}/${MY_P}"
 

diff --git a/app-backup/backuppc/backuppc-4.4.0.ebuild 
b/app-backup/backuppc/backuppc-4.4.0.ebuild
index 0f8ea69edd64..9cdff04fee51 100644
--- a/app-backup/backuppc/backuppc-4.4.0.ebuild
+++ b/app-backup/backuppc/backuppc-4.4.0.ebuild
@@ -8,7 +8,7 @@ MY_P="BackupPC-${PV}"
 inherit depend.apache systemd
 
 DESCRIPTION="High-performance backups to a server's disk"
-HOMEPAGE="http://backuppc.sourceforge.net/;
+HOMEPAGE="https://backuppc.github.io/backuppc/index.html;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz;
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2022-04-25 Thread Sam James 
commit: 21642531418df4bbf19c2bbb1460b474b9053339
Author: Dennis Eisele  dennis-eisele  de>
AuthorDate: Sat Apr  2 22:17:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 26 05:13:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21642531

app-backup/backuppc: bump to version 4.4.0 and take over package

Closes: https://bugs.gentoo.org/613538
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Dennis Eisele  dennis-eisele.de>
Closes: https://github.com/gentoo/gentoo/pull/24363
Signed-off-by: Sam James  gentoo.org>

 app-backup/backuppc/Manifest  |   1 +
 app-backup/backuppc/backuppc-4.4.0.ebuild | 187 ++
 app-backup/backuppc/metadata.xml  |   9 +-
 3 files changed, 196 insertions(+), 1 deletion(-)

diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index f08fa93f29ea..81a72c05dff6 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -1 +1,2 @@
 DIST BackupPC-3.3.1.tar.gz 556461 BLAKE2B 
91477196506291fb542a266aca4182ad727758ccf8379c135dcd5147d42b5f1f58d094473430fee64f67e0fc75e077fdf92bfcdaf2313dd53480737666746160
 SHA512 
b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6
+DIST BackupPC-4.4.0.tar.gz 657309 BLAKE2B 
db977b73b09e1b2a051e38ecc94567cb516e2b11eca79c23bb0c4eef508e78cbbc984aaee4c84dc4ecd0524d849195c14dfe395ff97f77b6c7cf8adff152d75e
 SHA512 
0c88447ab000c4a452034d5d8a074cd56801c7b38b0886e686e446c73ecfd0a40f0aa08703f76d16c31b24aec85c10c4ed1815d0cb67be5a1d66e5caeb3de418

diff --git a/app-backup/backuppc/backuppc-4.4.0.ebuild 
b/app-backup/backuppc/backuppc-4.4.0.ebuild
new file mode 100644
index ..0f8ea69edd64
--- /dev/null
+++ b/app-backup/backuppc/backuppc-4.4.0.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="BackupPC-${PV}"
+
+inherit depend.apache systemd
+
+DESCRIPTION="High-performance backups to a server's disk"
+HOMEPAGE="http://backuppc.sourceforge.net/;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rss samba"
+
+DEPEND="
+   acct-group/backuppc
+   acct-user/backuppc
+   app-admin/apache-tools
+   app-admin/makepasswd
+   dev-lang/perl
+"
+
+# The CGI modules are handled in ${RDEPEND}.
+APACHE_MODULES="apache2_modules_alias," # RedirectMatch
+APACHE_MODULES+="apache2_modules_authn_core," # AuthType
+APACHE_MODULES+="apache2_modules_authz_core," # Require
+APACHE_MODULES+="apache2_modules_authz_host," # Require host
+APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
+
+# Older versions of mod_perl think they're compatible with apache-2.4,
+# so we require the new one explicitly.
+RDEPEND="
+   ${DEPEND}
+   app-arch/par2cmdline
+   dev-perl/Archive-Zip
+   dev-perl/CGI
+   dev-perl/File-RsyncP
+   dev-perl/libwww-perl
+   dev-perl/BackupPC-XS
+   net-misc/rsync-bpc
+   virtual/mta
+   virtual/perl-IO-Compress
+   www-apache/mod_perl
+   www-apache/mpm_itk
+   || (
+   >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+   >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+   )
+   rss? ( dev-perl/XML-RSS )
+   samba? ( net-fs/samba )"
+
+CGIDIR="/usr/lib/backuppc/htdocs"
+CONFDIR="${EROOT}/etc/${EPREFIX}"
+DATADIR="/var/lib/backuppc"
+DOCDIR="/usr/share/doc/${PF}"
+LOGDIR="/var/log/BackupPC"
+need_apache2_4
+
+src_prepare() {
+   default
+
+   # Fix docs location using the marker that we've patched in.
+   sed "s+__DOCDIR__+${DOCDIR}+" -i lib/BackupPC/CGI/View.pm || die
+}
+
+src_install() {
+   local myconf
+   if use samba ; then
+   myconf=(
+   --bin-path smbclient=$(type -p smbclient)
+   --bin-path nmblookup=$(type -p nmblookup)
+   )
+   fi
+
+   /usr/bin/env perl ./configure.pl \
+   --batch \
+   --bin-path perl=$(type -p perl) \
+   --bin-path tar=$(type -p tar) \
+   --bin-path rsync=$(type -p rsync) \
+   --bin-path ping=$(type -p ping) \
+   --bin-path df=$(type -p df) \
+   --bin-path ssh=$(type -p ssh) \
+   --bin-path sendmail=$(type -p sendmail) \
+   --bin-path hostname=$(type -p hostname) \
+   --bin-path gzip=$(type -p gzip) \
+   --bin-path bzip2=$(type -p bzip2) \
+   --config-dir "${CONFDIR}" \
+   --install-dir /usr \
+   --data-dir "${DATADIR}" \
+   --hostname 127.0.0.1 \
+   --uid-ignore \
+   --dest-dir "${D}" \
+   --html-dir "${CGIDIR}"/image \

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2021-08-09 Thread Sam James 
commit: d9caf07978b9fcd4d1f242d11f52242e5638d4f2
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 10 02:54:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 10 02:59:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9caf079

app-backup/backuppc: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 app-backup/backuppc/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-backup/backuppc/metadata.xml b/app-backup/backuppc/metadata.xml
index 13724624fa8..55fa804a09c 100644
--- a/app-backup/backuppc/metadata.xml
+++ b/app-backup/backuppc/metadata.xml
@@ -4,5 +4,6 @@


backuppc
+   backuppc/backuppc

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/files/

2021-05-01 Thread Conrad Kostecki 
commit: 20bfd67bb2597bcf7884a81a62df555422ac1da3
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat May  1 11:18:42 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat May  1 11:18:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20bfd67b

app-backup/backuppc: fix patch

Closes: https://bugs.gentoo.org/787272
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-backup/backuppc/files/backuppc-3.3.1-perl526.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch 
b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
index ec7b9a63d06..0569e42a496 100644
--- a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
+++ b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
@@ -1,6 +1,6 @@
-diff -ruN BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm 
BackupPC-3.3.1/lib/BackupPC/Lib.pm
 a/BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm  2015-01-12 01:19:53.0 
+0100
-+++ b/BackupPC-3.3.1/lib/BackupPC/Lib.pm   2017-07-08 00:31:52.13197 
+0200
+diff -ruN a/lib/BackupPC/Lib.pm a/lib/BackupPC/Lib.pm
+--- a/lib/BackupPC/Lib.pm  2015-01-12 01:19:53.0 +0100
 b/lib/BackupPC/Lib.pm  2017-07-08 00:31:52.13197 +0200
 @@ -1261,7 +1261,7 @@
  #
  # Replace scalar variables first

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2021-04-28 Thread Sam James 
commit: b610b2d427350559fbf15bf02000530118eda811
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 29 01:39:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 29 01:51:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b610b2d4

app-backup/backuppc: fix variable reference style

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>

 app-backup/backuppc/backuppc-3.3.1-r6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
index 97bacafc0e0..5d45affdb88 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
@@ -25,14 +25,14 @@ DEPEND="
dev-lang/perl
 "
 
-# The CGI modules are handled in $RDEPEND.
+# The CGI modules are handled in ${RDEPEND}.
 APACHE_MODULES="apache2_modules_alias," # RedirectMatch
 APACHE_MODULES+="apache2_modules_authn_core," # AuthType
 APACHE_MODULES+="apache2_modules_authz_core," # Require
 APACHE_MODULES+="apache2_modules_authz_host," # Require host
 APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
 
-# Older versions of mod_perl think they're compatibile with apache-2.4,
+# Older versions of mod_perl think they're compatible with apache-2.4,
 # so we require the new one explicitly.
 RDEPEND="
${DEPEND}

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2021-04-19 Thread Sam James 
commit: fb0d5b1cf473ffa594946f46670780f3c8eec8c6
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:42:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0d5b1c

app-backup/backuppc: drop 3.3.1-r5

Signed-off-by: Sam James  gentoo.org>

 app-backup/backuppc/backuppc-3.3.1-r5.ebuild | 197 ---
 1 file changed, 197 deletions(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
deleted file mode 100644
index dd944952eb5..000
--- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit depend.apache epatch user systemd
-
-MY_P="BackupPC-${PV}"
-
-DESCRIPTION="High-performance backups to a server's disk"
-HOMEPAGE="http://backuppc.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-IUSE="rss samba"
-
-# The CGI modules are handled in $RDEPEND.
-APACHE_MODULES="apache2_modules_alias," # RedirectMatch
-APACHE_MODULES+="apache2_modules_authn_core," # AuthType
-APACHE_MODULES+="apache2_modules_authz_core," # Require
-APACHE_MODULES+="apache2_modules_authz_host," # Require host
-APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
-
-DEPEND="dev-lang/perl
-   app-admin/apache-tools
-   app-admin/makepasswd"
-
-# Older versions of mod_perl think they're compatibile with apache-2.4,
-# so we require the new one explicitly.
-RDEPEND="${DEPEND}
-   virtual/perl-IO-Compress
-   dev-perl/Archive-Zip
-   dev-perl/CGI
-   dev-perl/libwww-perl
-   app-arch/tar
-   app-arch/par2cmdline
-   app-arch/gzip
-   app-arch/bzip2
-   virtual/mta
-   >=www-apache/mod_perl-2.0.9
-   www-apache/mpm_itk
-   || ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
-
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
-
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
-   net-misc/rsync
-   dev-perl/File-RsyncP
-   rss? ( dev-perl/XML-RSS )
-   samba? ( net-fs/samba )"
-
-need_apache2_4
-
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-CGIDIR="/usr/lib/backuppc/htdocs"
-CONFDIR="/etc/BackupPC"
-DATADIR="/var/lib/backuppc"
-DOCDIR="/usr/share/doc/${PF}"
-LOGDIR="/var/log/BackupPC"
-
-pkg_setup() {
-   enewgroup backuppc
-   enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
-}
-
-src_prepare() {
-   epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
-   epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
-   epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
-
-   epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
-   epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
-
-   epatch "${FILESDIR}"/${P}-perl522.patch #580254
-   epatch "${FILESDIR}"/${P}-perl526.patch #594128
-
-   # Fix docs location using the marker that we've patched in.
-   sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
-   || die "failed to sed the documentation location"
-}
-
-src_install() {
-   local myconf
-   myconf=""
-   if use samba ; then
-   myconf="--bin-path smbclient=$(type -p smbclient)"
-   myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
-   fi
-
-   /usr/bin/env perl ./configure.pl \
-   --batch \
-   --bin-path perl=$(type -p perl) \
-   --bin-path tar=$(type -p tar) \
-   --bin-path rsync=$(type -p rsync) \
-   --bin-path ping=$(type -p ping) \
-   --bin-path df=$(type -p df) \
-   --bin-path ssh=$(type -p ssh) \
-   --bin-path sendmail=$(type -p sendmail) \
-   --bin-path hostname=$(type -p hostname) \
-   --bin-path gzip=$(type -p gzip) \
-   --bin-path bzip2=$(type -p bzip2) \
-   --config-dir "${CONFDIR}" \
-   --install-dir /usr \
-   --data-dir "${DATADIR}" \
-   --hostname 127.0.0.1 \
-   --uid-ignore \
-   --dest-dir "${D%/}" \
-   --html-dir "${CGIDIR}"/image \
-   --html-dir-url /image \
-   --cgi-dir "${CGIDIR}" \
-   --fhs \
-   ${myconf} || die "failed the configure.pl script"
-
-   ebegin "Installing documentation"
-
-   pod2man \
-   -errors=none \
-   --section=8 \
-   --center="BackupPC manual" \
-   "${S}"/doc/BackupPC.pod backuppc.8 \
-   || die "failed to generate man page"
-
-   doman backuppc.8
-
-   # Place the documentation in the correct location
-   dodoc

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2021-04-19 Thread Sam James 
commit: 669dd58db0cfcb3952fe48db9dc46fa4e54f0935
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:41:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669dd58d

app-backup/backuppc: forward stable keywords to 3.3.1-r6

Signed-off-by: Sam James  gentoo.org>

 app-backup/backuppc/backuppc-3.3.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
index a2b9c23aa1c..97bacafc0e0 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="rss samba"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/, app-backup/backuppc/files/, ...

2021-04-11 Thread Conrad Kostecki 
commit: 3a38c0451e9f781371191490e80f76d4100a62e3
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Apr 11 18:29:03 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Apr 11 19:23:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a38c045

app-backup/backuppc: migrate to GLEP 81

Also updated to EAPI=7.

Closes: https://bugs.gentoo.org/781209
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-backup/backuppc/backuppc-3.3.1-r6.ebuild   | 196 +
 .../files/3.2.0/04-add-docdir-marker.patch |   4 +-
 app-backup/backuppc/files/3.2.0/05-nicelevel.patch |   8 +-
 .../backuppc/files/3.3.0/01-fix-configure.pl.patch |   4 +-
 .../files/3.3.0/02-fix-config.pl-formatting.patch  |   4 +-
 .../3.3.0/03-reasonable-config.pl-defaults.patch   |   4 +-
 .../backuppc/files/backuppc-3.3.1-perl522.patch|   4 +-
 .../backuppc/files/backuppc-3.3.1-perl526.patch|   4 +-
 8 files changed, 212 insertions(+), 16 deletions(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
new file mode 100644
index 000..a2b9c23aa1c
--- /dev/null
+++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="BackupPC-${PV}"
+
+inherit depend.apache systemd
+
+DESCRIPTION="High-performance backups to a server's disk"
+HOMEPAGE="http://backuppc.sourceforge.net/;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rss samba"
+
+DEPEND="
+   acct-group/backuppc
+   acct-user/backuppc
+   app-admin/apache-tools
+   app-admin/makepasswd
+   dev-lang/perl
+"
+
+# The CGI modules are handled in $RDEPEND.
+APACHE_MODULES="apache2_modules_alias," # RedirectMatch
+APACHE_MODULES+="apache2_modules_authn_core," # AuthType
+APACHE_MODULES+="apache2_modules_authz_core," # Require
+APACHE_MODULES+="apache2_modules_authz_host," # Require host
+APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
+
+# Older versions of mod_perl think they're compatibile with apache-2.4,
+# so we require the new one explicitly.
+RDEPEND="
+   ${DEPEND}
+   app-arch/par2cmdline
+   dev-perl/Archive-Zip
+   dev-perl/CGI
+   dev-perl/File-RsyncP
+   dev-perl/libwww-perl
+   virtual/mta
+   virtual/perl-IO-Compress
+   www-apache/mod_perl
+   www-apache/mpm_itk
+   || (
+   >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+   >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+   
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid]
+   )
+   rss? ( dev-perl/XML-RSS )
+   samba? ( net-fs/samba )"
+
+PATCHES=(
+   "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
+   "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
+   "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
+   "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
+   "${FILESDIR}/3.2.0/05-nicelevel.patch"
+   "${FILESDIR}"/${P}-perl522.patch #580254
+   "${FILESDIR}"/${P}-perl526.patch #594128
+)
+
+CGIDIR="/usr/lib/backuppc/htdocs"
+CONFDIR="/etc/BackupPC"
+DATADIR="/var/lib/backuppc"
+DOCDIR="/usr/share/doc/${PF}"
+LOGDIR="/var/log/BackupPC"
+need_apache2_4
+
+src_prepare() {
+   default
+
+   # Fix initscript
+   sed -e 's/runscript/openrc-run/g' -i init.d/src/gentoo-backuppc || die
+
+   # Fix docs location using the marker that we've patched in.
+   sed "s+__DOCDIR__+${DOCDIR}+" -i "lib/BackupPC/CGI/View.pm" || die
+}
+
+src_install() {
+   local myconf
+   myconf=""
+   if use samba ; then
+   myconf="--bin-path smbclient=$(type -p smbclient)"
+   myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
+   fi
+
+   /usr/bin/env perl ./configure.pl \
+   --batch \
+   --bin-path perl=$(type -p perl) \
+   --bin-path tar=$(type -p tar) \
+   --bin-path rsync=$(type -p rsync) \
+   --bin-path ping=$(type -p ping) \
+   --bin-path df=$(type -p df) \
+   --bin-path ssh=$(type -p ssh) \
+   --bin-path sendmail=$(type -p sendmail) \
+   --bin-path hostname=$(type -p hostname) \
+   --bin-path gzip=$(type -p gzip) \
+   --bin-path bzip2=$(type -p bzip2) \
+   --config-dir "${CONFDIR}" \
+   --install-dir /usr \
+   --data-dir "${DATADIR}" \
+   --hostname 127.0.0.1 \
+   --uid-ignore \
+   --dest-dir "${D}" \
+   --html-dir "${CGIDIR}"/image \
+   --html-dir-url /image \
+   --cgi-dir

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2017-10-27 Thread Michael Palimaka 
commit: d8f17fdb5f98fc1329eaa0cc569e19e5d58c99e9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Oct 27 23:32:32 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Oct 27 23:32:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f17fdb

app-backup/backuppc: remove 3.3.1-r4

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 app-backup/backuppc/backuppc-3.3.1-r4.ebuild | 196 ---
 1 file changed, 196 deletions(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r4.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r4.ebuild
deleted file mode 100644
index 62d816fa2e8..000
--- a/app-backup/backuppc/backuppc-3.3.1-r4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit depend.apache eutils user systemd
-
-MY_P="BackupPC-${PV}"
-
-DESCRIPTION="High-performance backups to a server's disk"
-HOMEPAGE="http://backuppc.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-IUSE="rss samba"
-
-# The CGI modules are handled in $RDEPEND.
-APACHE_MODULES="apache2_modules_alias," # RedirectMatch
-APACHE_MODULES+="apache2_modules_authn_core," # AuthType
-APACHE_MODULES+="apache2_modules_authz_core," # Require
-APACHE_MODULES+="apache2_modules_authz_host," # Require host
-APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
-
-DEPEND="dev-lang/perl
-   app-admin/apache-tools
-   app-admin/makepasswd"
-
-# Older versions of mod_perl think they're compatibile with apache-2.4,
-# so we require the new one explicitly.
-RDEPEND="${DEPEND}
-   virtual/perl-IO-Compress
-   dev-perl/Archive-Zip
-   dev-perl/CGI
-   dev-perl/libwww-perl
-   app-arch/tar
-   app-arch/par2cmdline
-   app-arch/gzip
-   app-arch/bzip2
-   virtual/mta
-   >=www-apache/mod_perl-2.0.9
-   www-apache/mpm_itk
-   || ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
-
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
-
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
-   net-misc/rsync
-   dev-perl/File-RsyncP
-   rss? ( dev-perl/XML-RSS )
-   samba? ( net-fs/samba )"
-
-need_apache2_4
-
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-CGIDIR="/usr/lib/backuppc/htdocs"
-CONFDIR="/etc/BackupPC"
-DATADIR="/var/lib/backuppc"
-DOCDIR="/usr/share/doc/${PF}"
-LOGDIR="/var/log/BackupPC"
-
-pkg_setup() {
-   enewgroup backuppc
-   enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
-}
-
-src_prepare() {
-   epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
-   epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
-   epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
-
-   epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
-   epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
-
-   epatch "${FILESDIR}"/${P}-perl522.patch #580254
-
-   # Fix docs location using the marker that we've patched in.
-   sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
-   || die "failed to sed the documentation location"
-}
-
-src_install() {
-   local myconf
-   myconf=""
-   if use samba ; then
-   myconf="--bin-path smbclient=$(type -p smbclient)"
-   myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
-   fi
-
-   /usr/bin/env perl ./configure.pl \
-   --batch \
-   --bin-path perl=$(type -p perl) \
-   --bin-path tar=$(type -p tar) \
-   --bin-path rsync=$(type -p rsync) \
-   --bin-path ping=$(type -p ping) \
-   --bin-path df=$(type -p df) \
-   --bin-path ssh=$(type -p ssh) \
-   --bin-path sendmail=$(type -p sendmail) \
-   --bin-path hostname=$(type -p hostname) \
-   --bin-path gzip=$(type -p gzip) \
-   --bin-path bzip2=$(type -p bzip2) \
-   --config-dir "${CONFDIR}" \
-   --install-dir /usr \
-   --data-dir "${DATADIR}" \
-   --hostname 127.0.0.1 \
-   --uid-ignore \
-   --dest-dir "${D%/}" \
-   --html-dir "${CGIDIR}"/image \
-   --html-dir-url /image \
-   --cgi-dir "${CGIDIR}" \
-   --fhs \
-   ${myconf} || die "failed the configure.pl script"
-
-   ebegin "Installing documentation"
-
-   pod2man \
-   -errors=none \
-   --section=8 \
-   --center="BackupPC manual" \
-   "${S}"/doc/BackupPC.pod backuppc.8 \
-   || die "failed to generate man page"
-
-   doman backuppc.8
-
-   # Place the documentation in the correct location
-   dodoc "${D}/usr/doc/BackupPC.html"
-   dodoc

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2017-10-27 Thread Thomas Deutschmann 
commit: 611ced42e9a0c38c47fdd34cecf0137adcf834c5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Oct 27 13:14:31 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct 27 13:48:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611ced42

app-backup/backuppc: x86 stable (bug #627388)

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 app-backup/backuppc/backuppc-3.3.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
index 879139e9d5e..932f8a9640d 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://backuppc.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="rss samba"

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2017-08-26 Thread Mikle Kolyada 
commit: 29cda32aeb737f7ee78cafb3224ff0b2aa1f13cb
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Aug 26 08:54:19 2017 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Aug 26 08:54:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29cda32a

app-backup/backuppc: amd64 stable wrt bug #627388

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-backup/backuppc/backuppc-3.3.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
index a506f581e20..879139e9d5e 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://backuppc.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="rss samba"

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/, app-backup/backuppc/files/

2017-07-07 Thread Andreas Hüttel 
commit: ecb172112c03bebc7862a6d04967f25a4d27b847
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Jul  7 22:35:23 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Jul  7 22:35:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecb17211

app-backup/backuppc: Add revision bump with Perl 5.26 compatibility patch, bug 
594128

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-backup/backuppc/backuppc-3.3.1-r5.ebuild   | 197 +
 .../backuppc/files/backuppc-3.3.1-perl526.patch|  21 +++
 2 files changed, 218 insertions(+)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
new file mode 100644
index 000..a506f581e20
--- /dev/null
+++ b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit depend.apache eutils user systemd
+
+MY_P="BackupPC-${PV}"
+
+DESCRIPTION="High-performance backups to a server's disk"
+HOMEPAGE="http://backuppc.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="rss samba"
+
+# The CGI modules are handled in $RDEPEND.
+APACHE_MODULES="apache2_modules_alias," # RedirectMatch
+APACHE_MODULES+="apache2_modules_authn_core," # AuthType
+APACHE_MODULES+="apache2_modules_authz_core," # Require
+APACHE_MODULES+="apache2_modules_authz_host," # Require host
+APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
+
+DEPEND="dev-lang/perl
+   app-admin/apache-tools
+   app-admin/makepasswd"
+
+# Older versions of mod_perl think they're compatibile with apache-2.4,
+# so we require the new one explicitly.
+RDEPEND="${DEPEND}
+   virtual/perl-IO-Compress
+   dev-perl/Archive-Zip
+   dev-perl/CGI
+   dev-perl/libwww-perl
+   app-arch/tar
+   app-arch/par2cmdline
+   app-arch/gzip
+   app-arch/bzip2
+   virtual/mta
+   >=www-apache/mod_perl-2.0.9
+   www-apache/mpm_itk
+   || ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
+   net-misc/rsync
+   dev-perl/File-RsyncP
+   rss? ( dev-perl/XML-RSS )
+   samba? ( net-fs/samba )"
+
+need_apache2_4
+
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+CGIDIR="/usr/lib/backuppc/htdocs"
+CONFDIR="/etc/BackupPC"
+DATADIR="/var/lib/backuppc"
+DOCDIR="/usr/share/doc/${PF}"
+LOGDIR="/var/log/BackupPC"
+
+pkg_setup() {
+   enewgroup backuppc
+   enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
+}
+
+src_prepare() {
+   epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
+   epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
+   epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
+
+   epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
+   epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
+
+   epatch "${FILESDIR}"/${P}-perl522.patch #580254
+   epatch "${FILESDIR}"/${P}-perl526.patch #594128
+
+   # Fix docs location using the marker that we've patched in.
+   sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
+   || die "failed to sed the documentation location"
+}
+
+src_install() {
+   local myconf
+   myconf=""
+   if use samba ; then
+   myconf="--bin-path smbclient=$(type -p smbclient)"
+   myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
+   fi
+
+   /usr/bin/env perl ./configure.pl \
+   --batch \
+   --bin-path perl=$(type -p perl) \
+   --bin-path tar=$(type -p tar) \
+   --bin-path rsync=$(type -p rsync) \
+   --bin-path ping=$(type -p ping) \
+   --bin-path df=$(type -p df) \
+   --bin-path ssh=$(type -p ssh) \
+   --bin-path sendmail=$(type -p sendmail) \
+   --bin-path hostname=$(type -p hostname) \
+   --bin-path gzip=$(type -p gzip) \
+   --bin-path bzip2=$(type -p bzip2) \
+   --config-dir "${CONFDIR}" \
+   --install-dir /usr \
+   --data-dir "${DATADIR}" \
+   --hostname 127.0.0.1 \
+   --uid-ignore \
+   --dest-dir "${D%/}" \
+   --html-dir "${CGIDIR}"/image \
+   --html-dir-url /image \
+   --cgi-dir "${CGIDIR}" \
+   --fhs \
+   ${myconf} || die "failed the configure.pl script"
+
+   ebegin "Installing documentation"
+
+   pod2man \
+   -errors=none \
+   --section=8 \
+   --center="BackupPC manual" \
+   "${S}"/doc/BackupPC.pod backuppc.8 \
+   || die "failed to

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2017-02-01 Thread Kent Fredric 
commit: 6787ee8c5e83ee250d6df5d61d38aa8cba75eb53
Author: Kent Fredric  gentoo  org>
AuthorDate: Wed Feb  1 18:41:34 2017 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Wed Feb  1 22:21:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6787ee8c

app-backup/backuppc: Cleanup versions broken by Perl 5.22

Bug: https://bugs.gentoo.org/580254

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-backup/backuppc/Manifest |   1 -
 app-backup/backuppc/backuppc-3.3.0-r2.ebuild | 223 ---
 app-backup/backuppc/backuppc-3.3.1-r2.ebuild | 195 ---
 3 files changed, 419 deletions(-)

diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index 07d6999..8201ca7 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -1,2 +1 @@
-DIST BackupPC-3.3.0.tar.gz 554155 SHA256 
8a9c1b6faa4502b4c40617be97e806813815d9e22544854d99983c3da7c1f69b SHA512 
67ec1ca4d22ab1e81f9c0f409c758347a6c772e3d1aa39c93207f9d328176ac7b4e679d0b03972fc5870c37dde0480d28c61ae19975d54e144235ea0e84e9901
 WHIRLPOOL 
23a9ce5dd600843cea72354e1afe595e3779f883839f8d3feca7f1355ed20048026090097ddfbcf394632672b42bef4884bc6661203542d6fe2c6bc2e8ad7b96
 DIST BackupPC-3.3.1.tar.gz 556461 SHA256 
c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c SHA512 
b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6
 WHIRLPOOL 
1d895f530932fc1287cde9db584befc6ca0850b5841cc4e60927442d0db662ec092bda4efa4953650d3bfa13deb6e9fafa25c10f82e19b39c67969bb4e143bac

diff --git a/app-backup/backuppc/backuppc-3.3.0-r2.ebuild 
b/app-backup/backuppc/backuppc-3.3.0-r2.ebuild
deleted file mode 100644
index 7ea269c..
--- a/app-backup/backuppc/backuppc-3.3.0-r2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils systemd webapp user
-
-MY_P="BackupPC-${PV}"
-
-DESCRIPTION="A high-performance system for backing up computers to a server's 
disk"
-HOMEPAGE="http://backuppc.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="rss samba"
-
-DEPEND="dev-lang/perl
-   app-admin/apache-tools
-   app-admin/makepasswd"
-RDEPEND="${DEPEND}
-   virtual/perl-IO-Compress
-   dev-perl/Archive-Zip
-   dev-perl/libwww-perl
-   >=app-arch/tar-1.13.20
-   app-arch/par2cmdline
-   app-arch/gzip
-   app-arch/bzip2
-   virtual/mta
-   www-apache/mod_perl
-   www-servers/apache
-   net-misc/rsync
-   >=dev-perl/File-RsyncP-0.68
-   rss? ( dev-perl/XML-RSS )
-   samba? ( net-fs/samba )"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-CONFDIR="/etc/BackupPC"
-DATADIR="/var/lib/backuppc"
-LOGDIR="/var/log/BackupPC"
-
-pkg_setup() {
-   webapp_pkg_setup
-   enewgroup backuppc
-   enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
-}
-
-src_prepare() {
-   epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
-   epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
-   epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
-
-   # Fix the documentation location in the CGI interface
-   epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
-   sed -i "s+__DOCDIR__+/usr/share/doc/${PF}+" "lib/BackupPC/CGI/View.pm"
-
-   epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
-   sed -i -e 's/--chuid ${USER}//' "${S}"/init.d/src/gentoo-backuppc || 
die "Failed to fix the init script"
-}
-
-src_test() {
-   true
-}
-
-src_install() {
-   webapp_src_preinst
-
-   local myconf
-   myconf=""
-   if use samba ; then
-   myconf="--bin-path smbclient=$(type -p smbclient)"
-   myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
-   fi
-
-   /usr/bin/env perl ./configure.pl \
-   --batch \
-   --bin-path perl=$(type -p perl) \
-   --bin-path tar=$(type -p tar) \
-   --bin-path rsync=$(type -p rsync) \
-   --bin-path ping=$(type -p ping) \
-   --bin-path df=$(type -p df) \
-   --bin-path ssh=$(type -p ssh) \
-   --bin-path sendmail=$(type -p sendmail) \
-   --bin-path hostname=$(type -p hostname) \
-   --bin-path gzip=$(type -p gzip) \
-   --bin-path bzip2=$(type -p bzip2) \
-   --config-dir ${CONFDIR} \
-   --install-dir /usr \
-   --data-dir ${DATADIR} \
-   --hostname $(hostname) \
-   --uid-ignore \
-   --dest-dir "${D%/}" \
-   --html-dir ${MY_HTDOCSDIR}/image \
-   --html-dir-url /image \
-   --cgi-dir ${MY_HTDOCSDIR} \
-   --fhs \
-

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/files/3.3.0/

2017-02-01 Thread Kent Fredric 
commit: fb99cd30c126791ca56dcbc538706ce3e977de09
Author: Kent Fredric  gentoo  org>
AuthorDate: Wed Feb  1 20:10:43 2017 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Wed Feb  1 22:21:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb99cd30

app-backup/backuppc: Prune unnecessary formatting changes from patches

Patch set included 22kb of cosmetic changes, some of which were not really
cosmetic at all, while being pretended as being cosmetic.

For instance, changing the default umask from 027 to 27 ignores the fact
that a '0' prefix implies octal, so removing the '0' turned the umask from
027 to 033 

That is, changes:

  - u=rwx,g=rx,o=rx
  + u=rwx,g=r,o=r

However, some of the changes had real semantic differences that could
affect picky enough code, so I've preserved some of them, while culling
those that were completely unnesscary.

If this revert-of-patch introduces problems for you, please file a bug
so we can triage the real problems under an umbrella more well defined than
"formatting"

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/3.3.0/02-fix-config.pl-formatting.patch  | 730 +
 .../3.3.0/03-reasonable-config.pl-defaults.patch   |  67 +-
 2 files changed, 75 insertions(+), 722 deletions(-)

diff --git a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch 
b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
index ae37cda..79ad654 100644
--- a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
+++ b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
@@ -1,96 +1,6 @@
 --- conf/config.pl.dist2013-09-23 23:05:50.332064754 +0300
 +++ conf/config.pl 2013-09-23 23:07:44.110943607 +0300
-@@ -87,7 +87,7 @@
- # Default value prevents any access from group other, and prevents
- # group write.
- #
--$Conf{UmaskMode} = 027;
-+$Conf{UmaskMode} = 27;
- 
- #
- # Times at which we wake up, check all the PCs, and schedule necessary
-@@ -113,7 +113,31 @@
- # you want BackupPC_nightly to run (eg: when you don't expect a lot
- # of regular backups to run).
- #
--$Conf{WakeupSchedule} = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 
16, 17, 18, 19, 20, 21, 22, 23];
-+$Conf{WakeupSchedule} = [
-+  1,
-+  2,
-+  3,
-+  4,
-+  5,
-+  6,
-+  7,
-+  8,
-+  9,
-+  10,
-+  11,
-+  12,
-+  13,
-+  14,
-+  15,
-+  16,
-+  17,
-+  18,
-+  19,
-+  20,
-+  21,
-+  22,
-+  23
-+];
- 
- #
- # Maximum number of simultaneous backups to run.  If there
-@@ -224,9 +248,9 @@
- # Full path to various commands for archiving
- #
- $Conf{SplitPath} = '';
--$Conf{ParPath}   = '';
--$Conf{CatPath}   = '';
--$Conf{GzipPath}  = '';
-+$Conf{ParPath} = '';
-+$Conf{CatPath} = '';
-+$Conf{GzipPath} = '';
- $Conf{Bzip2Path} = '';
- 
- #
-@@ -302,11 +326,11 @@
- # a symbolic link to the new location, or mount the new BackupPC
- # store at the existing $Conf{TopDir} setting.
- #
--$Conf{TopDir}  = '';
--$Conf{ConfDir} = '';
--$Conf{LogDir}  = '';
--$Conf{InstallDir}  = '';
--$Conf{CgiDir}  = '';
-+$Conf{TopDir} = '';
-+$Conf{ConfDir} = '';
-+$Conf{LogDir} = '';
-+$Conf{InstallDir} = '';
-+$Conf{CgiDir} = '';
- 
- #
- # Whether BackupPC and the CGI script BackupPC_Admin verify that they
-@@ -316,7 +340,7 @@
- # BackupPC might be accidently started as root or the wrong user,
- # or if the CGI script is not installed correctly.
- #
--$Conf{BackupPCUserVerify} = 1;
-+$Conf{BackupPCUserVerify} = '1';
- 
- #
- # Maximum number of hardlinks supported by the $TopDir file system
-@@ -333,7 +357,7 @@
- # Advanced option for asking BackupPC to load additional perl modules.
- # Can be a list (array ref) of module names to load at startup.
- #
--$Conf{PerlModuleLoad} = undef;
-+$Conf{PerlModuleLoad} = undef;
- 
- #
- # Path to init.d script and command to use that script to start the
-@@ -355,7 +379,7 @@
+@@ -355,7 +355,7 @@
  # needs to be a full path and you can't include shell syntax like
  # redirection and pipes; put that in a script if you need it.
  #
@@ -99,7 +9,7 @@
  $Conf{ServerInitdStartCmd} = '';
  
  
-@@ -373,7 +397,7 @@
+@@ -373,7 +373,7 @@
  # time taken for the backup, plus the granularity of $Conf{WakeupSchedule}
  # will make the actual backup interval a bit longer.
  #
@@ -108,7 +18,7 @@
  
  #
  # Minimum period in days between incremental backups (a user requested
-@@ -383,7 +407,7 @@
+@@ -383,7 +383,7 @@
  # time taken for the backup, plus the granularity of $Conf{WakeupSchedule}
  # will make the actual backup interval a bit longer.
  #
@@ -117,56 +27,16 @@
  
  #
  # Number of full backups to keep.  Must be >= 1.
-@@ -458,7 +482,9 @@
+@@ -458,7 +458,7 @@
  #$Conf{FullKeepCnt} = 4;
  #$Conf{FullKeepCnt} = [4];
  #
 -$Conf{FullKeepCnt} = 1;
-+$Conf{FullKeepCnt} = [
-+  1
-+];
++$Conf{FullKeepCnt} = [1];
  
  #
  # Very old full backups are removed after $Conf{FullAgeMax} days.  However,
-@@ -470,7 +496,7 @@
- # full backups to exceed $Conf{FullAgeMax}.

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2017-02-01 Thread Kent Fredric 
commit: 978d5d8983f35c57202e938a012dfa319e05c1ca
Author: Kent Fredric  gentoo  org>
AuthorDate: Wed Feb  1 22:21:13 2017 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Wed Feb  1 22:21:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978d5d89

app-backup/backuppc: -r1 bump for RDEP propagation

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../backuppc/{backuppc-3.3.1-r3.ebuild => backuppc-3.3.1-r4.ebuild}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r3.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r4.ebuild
similarity index 100%
rename from app-backup/backuppc/backuppc-3.3.1-r3.ebuild
rename to app-backup/backuppc/backuppc-3.3.1-r4.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/files/3.2.0/, app-backup/backuppc/files/

2017-02-01 Thread Kent Fredric 
commit: 942c161389f49f41ce3d1390f06b806cbd9976aa
Author: Kent Fredric  gentoo  org>
AuthorDate: Wed Feb  1 19:17:47 2017 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Wed Feb  1 22:21:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942c1613

app-backup/backuppc: Remove unused patches

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../backuppc/files/3.2.0/01-fix-configure.pl.patch |  30 --
 .../3.2.0/03-reasonable-config.pl-defaults.patch   |  47 ---
 app-backup/backuppc/files/apache2-backuppc.conf|  73 -
 app-backup/backuppc/files/apache2-backuppc.init| 170 ---
 app-backup/backuppc/files/httpd.conf   | 332 -
 5 files changed, 652 deletions(-)

diff --git a/app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch 
b/app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch
deleted file mode 100644
index 060cf95..
--- a/app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
 configure.pl.orig  2010-07-31 20:52:58.0 +0300
-+++ configure.pl   2010-09-03 22:09:46.437788435 +0300
-@@ -158,7 +158,7 @@
- # config file to get all the defaults.
- #
- my $ConfigPath = "";
--my $ConfigFileOK = 1;
-+my $ConfigFileOK = 0;
- while ( 1 ) {
- if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl" ) {
- $ConfigPath = "/etc/BackupPC/config.pl";
-@@ -213,7 +213,8 @@
- $bpc->{LogDir} = $Conf{LogDir}  = "$Conf{TopDir}/log"
- if ( $Conf{LogDir} eq '' );
- }
--$bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
-+# Disable this as it's not really neccessary for this ebuild
-+# $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
- my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1);
- if ( $err eq "" ) {
- print < administrative users are only craig and celia'.
- #
- $Conf{CgiAdminUserGroup} = '';
--$Conf{CgiAdminUsers} = '';
-+$Conf{CgiAdminUsers} = 'backuppc';
- 
- #
- # URL of the BackupPC_Admin CGI script.  Used for email messages.
-@@ -2062,7 +2066,7 @@
- # dates (MM/DD), a value of 2 uses full -MM-DD format, and zero
- # for international dates (DD/MM).
- #
--$Conf{CgiDateFormatMMDD} = 1;
-+$Conf{CgiDateFormatMMDD} = 2;
- 
- #
- # If set, the complete list of hosts appears in the left navigation
-@@ -2248,7 +2252,7 @@
-   ClientTimeout => 1,
-   MaxOldPerPCLogFiles => 1,
-   CompressLevel => 1,
--  ClientNameAlias => 1,
-+  ClientNameAlias => 0,
-   DumpPreUserCmd => 0,
-   DumpPostUserCmd => 0,
-   RestorePreUserCmd => 0,

diff --git a/app-backup/backuppc/files/apache2-backuppc.conf 
b/app-backup/backuppc/files/apache2-backuppc.conf
deleted file mode 100644
index 4df0b4e..
--- a/app-backup/backuppc/files/apache2-backuppc.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-# /etc/conf.d/apache2: config file for /etc/init.d/apache2
-
-# When you install a module it is easy to activate or deactivate the modules
-# and other features of apache using the APACHE2_OPTS line. Every module should
-# install a configuration in /etc/apache2/modules.d. In that file will have an
-#  directive where NNN is the option to enable that module.
-#
-# Here are the options available in the default configuration:
-#
-#  AUTH_DIGEST  Enables mod_auth_digest
-#  AUTHNZ_LDAP  Enables authentication through mod_ldap (available if USE=ldap)
-#  CACHEEnables mod_cache
-#  DAV  Enables mod_dav
-#  ERRORDOCSEnables default error documents for many languages.
-#  INFO Enables mod_info, a useful module for debugging
-#  LANGUAGE Enables content-negotiation based on language and charset.
-#  LDAP Enables mod_ldap (available if USE=ldap)
-#  MANUAL   Enables /manual/ to be the apache manual (available if 
USE=docs)
-#  MEM_CACHE

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2017-02-01 Thread Kent Fredric 
commit: 93239e393a2a58e0484776e5cf7bb457f646671f
Author: Kent Fredric  gentoo  org>
AuthorDate: Wed Feb  1 22:19:54 2017 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Wed Feb  1 22:21:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93239e39

app-backup/backuppc: Fix missing dependency on dev-perl/CGI

Reported by Rob Ownens via funtoo

Bug: https://bugs.funtoo.org/browse/FL-3525

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-backup/backuppc/backuppc-3.3.1-r3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r3.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
index 6a779f4..d0c712b 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,6 +32,7 @@ DEPEND="dev-lang/perl
 RDEPEND="${DEPEND}
virtual/perl-IO-Compress
dev-perl/Archive-Zip
+   dev-perl/CGI
dev-perl/libwww-perl
app-arch/tar
app-arch/par2cmdline

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2016-12-21 Thread Thomas Deutschmann 
commit: 40c8097bb28f6c8644b51ad19670bb21940a14ea
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Dec 21 20:41:13 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Dec 21 21:33:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c8097b

app-backup/backuppc: x86 stable (bug #600906)

Package-Manager: Portage-2.3.2, Repoman-2.3.1

 app-backup/backuppc/backuppc-3.3.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r3.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
index c7454aa..6a779f4 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://backuppc.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="rss samba"

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2016-12-21 Thread Tobias Klausmann 
commit: 720265ca465c26d8fe02d897b08d287e58324b67
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Wed Dec 21 16:42:17 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Wed Dec 21 17:27:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=720265ca

app-backup/backuppc-3.3.1-r3: stable on amd64

Gentoo-Bug: 600906

 app-backup/backuppc/backuppc-3.3.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r3.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
index 8d292d6..c7454aa 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://backuppc.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="rss samba"

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/, app-backup/backuppc/files/

2016-11-26 Thread Pacho Ramos 
commit: 7f57742cb7cc422bfff1f62fb62a639bbab7de79
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Nov 26 12:53:42 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Nov 26 12:55:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f57742c

app-backup/backuppc: Fix perl-5.22 compat (#580254 by Till Korten)

Package-Manager: portage-2.3.2

 app-backup/backuppc/backuppc-3.3.1-r3.ebuild   | 196 +
 .../backuppc/files/backuppc-3.3.1-perl522.patch|  17 ++
 2 files changed, 213 insertions(+)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r3.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
new file mode 100644
index ..8d292d6
--- /dev/null
+++ b/app-backup/backuppc/backuppc-3.3.1-r3.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit depend.apache eutils user systemd
+
+MY_P="BackupPC-${PV}"
+
+DESCRIPTION="High-performance backups to a server's disk"
+HOMEPAGE="http://backuppc.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="rss samba"
+
+# The CGI modules are handled in $RDEPEND.
+APACHE_MODULES="apache2_modules_alias," # RedirectMatch
+APACHE_MODULES+="apache2_modules_authn_core," # AuthType
+APACHE_MODULES+="apache2_modules_authz_core," # Require
+APACHE_MODULES+="apache2_modules_authz_host," # Require host
+APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
+
+DEPEND="dev-lang/perl
+   app-admin/apache-tools
+   app-admin/makepasswd"
+
+# Older versions of mod_perl think they're compatibile with apache-2.4,
+# so we require the new one explicitly.
+RDEPEND="${DEPEND}
+   virtual/perl-IO-Compress
+   dev-perl/Archive-Zip
+   dev-perl/libwww-perl
+   app-arch/tar
+   app-arch/par2cmdline
+   app-arch/gzip
+   app-arch/bzip2
+   virtual/mta
+   >=www-apache/mod_perl-2.0.9
+   www-apache/mpm_itk
+   || ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
+   net-misc/rsync
+   dev-perl/File-RsyncP
+   rss? ( dev-perl/XML-RSS )
+   samba? ( net-fs/samba )"
+
+need_apache2_4
+
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+CGIDIR="/usr/lib/backuppc/htdocs"
+CONFDIR="/etc/BackupPC"
+DATADIR="/var/lib/backuppc"
+DOCDIR="/usr/share/doc/${PF}"
+LOGDIR="/var/log/BackupPC"
+
+pkg_setup() {
+   enewgroup backuppc
+   enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
+}
+
+src_prepare() {
+   epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
+   epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
+   epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
+
+   epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
+   epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
+
+   epatch "${FILESDIR}"/${P}-perl522.patch #580254
+
+   # Fix docs location using the marker that we've patched in.
+   sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
+   || die "failed to sed the documentation location"
+}
+
+src_install() {
+   local myconf
+   myconf=""
+   if use samba ; then
+   myconf="--bin-path smbclient=$(type -p smbclient)"
+   myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
+   fi
+
+   /usr/bin/env perl ./configure.pl \
+   --batch \
+   --bin-path perl=$(type -p perl) \
+   --bin-path tar=$(type -p tar) \
+   --bin-path rsync=$(type -p rsync) \
+   --bin-path ping=$(type -p ping) \
+   --bin-path df=$(type -p df) \
+   --bin-path ssh=$(type -p ssh) \
+   --bin-path sendmail=$(type -p sendmail) \
+   --bin-path hostname=$(type -p hostname) \
+   --bin-path gzip=$(type -p gzip) \
+   --bin-path bzip2=$(type -p bzip2) \
+   --config-dir "${CONFDIR}" \
+   --install-dir /usr \
+   --data-dir "${DATADIR}" \
+   --hostname 127.0.0.1 \
+   --uid-ignore \
+   --dest-dir "${D%/}" \
+   --html-dir "${CGIDIR}"/image \
+   --html-dir-url /image \
+   --cgi-dir "${CGIDIR}" \
+   --fhs \
+   ${myconf} || die "failed the configure.pl script"
+
+   ebegin "Installing documentation"
+
+   pod2man \
+   -errors=none \
+   --section=8 \
+   --center="BackupPC manual" \
+   "${S}"/doc/BackupPC.pod backuppc.8 \
+   || die "failed to generate man page"
+
+   doman backuppc.8
+
+   # Place the documentation in the correct location
+   dodoc

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/files/

2016-07-07 Thread Patrice Clement 
commit: 622b21cf681b659f19e80030367c653c9ec2730e
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Mon Jul  4 19:13:09 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Jul  7 07:19:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622b21cf

app-backup/backuppc: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/1826

Signed-off-by: Patrice Clement  gentoo.org>

 app-backup/backuppc/files/BackupPC-2.1.2pl2.diff | 202 ---
 app-backup/backuppc/files/postinstall-en.txt |   1 -
 2 files changed, 203 deletions(-)

diff --git a/app-backup/backuppc/files/BackupPC-2.1.2pl2.diff 
b/app-backup/backuppc/files/BackupPC-2.1.2pl2.diff
deleted file mode 100644
index e98ff4f..000
--- a/app-backup/backuppc/files/BackupPC-2.1.2pl2.diff
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-# BackupPC-2.1.2pl2.diff: BackupPC patch file generated
-# on Sun Jun 18 19:36:32 2006.
-#
-# This patch file should be applied to a cleanly unpacked BackupPC
-# version 2.1.2.  Do not apply any old patch files; each
-# patch file accumulates all previous changes.
-#
-# Example:
-#
-# # fetch BackupPC-2.1.2.tar.gz
-# # fetch BackupPC-2.1.2pl2.diff
-# tar zxvf BackupPC-2.1.2.tar.gz
-# cd BackupPC-2.1.2
-# patch -p0 < ../BackupPC-2.1.2pl2.diff
-# perl configure.pl
-#
-# ChangeLog:
-#
-#  - In conf/config.pl, changed --devices to -D in $Conf{RsyncArgs}
-#and $Conf{RsyncRestoreArgs} to fix "fileListReceive failed" and
-#"Can't open .../f%2f for empty output" errors with rsync 2.6.7+.
-#Fix proposed by Justin Pessa and Vincent Ho, and confirmed by
-#Dan Niles.
-#
-#  - Added patch from Michael (mna.news) to ignore "file is unchanged"
-#message from tar 1.15.x during incremental backups.
-#
-#  - Fixed creation of .rsrc directories in bin/BackupPC_tarExtract
-#when used with xtar on MacOS.  Reported by Samuel Bancal and
-#Matthew Radey, who helped with debugging.
-#
-#  - Fixed bug in BackupPC_tarExtract for files >8GB in size whose
-#lengths are multiples of 256.  Reported by Jamie Myers and
-#Marko Tukiainen, who both helped debugging the problem.
-#
-#  - Fixed bug in lib/BackupPC/Xfer/RsyncFileIO.pm that caused
-#incorrected deleted attributes to be set in directories
-#where one of the files had an rsync phase 1 retry during
-#an incremental.  Reported by Tony Nelson.
-#
 bin/BackupPC_tarExtract2005-09-05 16:21:21.0 -0700
-+++ bin/BackupPC_tarExtract2006-06-18 19:36:31.995945464 -0700
-@@ -58,7 +58,7 @@
- exit(1);
- }
- my $client = $1;
--if ( $ARGV[1] !~ /^([\w\s\.\/\$-]+)$/ ) {
-+if ( $ARGV[1] !~ /^([\w\s.\/$(){}[\]-]+)$/ ) {
- print("$0: bad share name '$ARGV[1]'\n");
- exit(1);
- }
-@@ -101,7 +101,7 @@
- # Copyright 1998 Stephen Zander. All rights reserved.
- #
- my $tar_unpack_header
--= 'Z100 A8 A8 A8 A12 A12 A8 A1 Z100 A6 A2 Z32 Z32 A8 A8 A155 x12';
-+= 'Z100 A8 A8 A8 a12 A12 A8 A1 Z100 A6 A2 Z32 Z32 A8 A8 A155 x12';
- my $tar_header_length = 512;
- 
- my $BufSize  = 1048576; # 1MB or 2^20
-@@ -251,7 +251,7 @@
- $name = $longName if ( defined($longName) );
- $linkname = $longLink if ( defined($longLink) );
- $name =~ s{^\./+}{};
--$name =~ s{/+$}{};
-+$name =~ s{/+\.?$}{};
- $name =~ s{//+}{/}g;
- return {
- name   => $name,
-@@ -313,7 +313,7 @@
- #
- my($nRead);
- #print("Reading $f->{name}, $f->{size} bytes, type $f->{type}\n");
--pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $file, $f);
-+pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $f);
- my $poolWrite = BackupPC::PoolWrite->new($bpc,
-  
"$OutDir/$ShareName/$f->{mangleName}",
-  $f->{size}, $Compress);
-@@ -351,7 +351,7 @@
-   # a plain file.
- #
- $f->{size} = length($f->{linkname});
--pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $file, $f);
-+pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $f);
- my $poolWrite = BackupPC::PoolWrite->new($bpc,
-  
"$OutDir/$ShareName/$f->{mangleName}",
-  $f->{size}, $Compress);
-@@ -369,7 +369,7 @@
- # contents.
- #
- $f->{size} = length($f->{linkname});
--pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $file, $f);
-+pathCreate($dir, "$OutDir/$ShareName/$f->{mangleName}", $f);
- my $poolWrite = BackupPC::PoolWrite->new($bpc,
-  
"$OutDir/$ShareName/$f->{mangleName}",
-  $f->{size}, $Compress);
-@@ -393,7 +393,7 @@
- } else {
- $data = "$f->{devmajor},$f->{devminor}";
- }
--

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/files/, app-backup/backuppc/

2016-04-25 Thread Austin English 
commit: 8620f337adbec2ad29ac315a317c577afbf4d829
Author: Austin English  gentoo  org>
AuthorDate: Mon Apr 25 23:58:49 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Tue Apr 26 00:00:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8620f337

app-backup/backuppc: use #!/sbin/openrc-run instead of #!/sbin/runscript

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=573846

 app-backup/backuppc/backuppc-3.3.0-r2.ebuild| 223 
 app-backup/backuppc/backuppc-3.3.1-r2.ebuild| 195 +
 app-backup/backuppc/files/apache2-backuppc.init |   4 +-
 3 files changed, 420 insertions(+), 2 deletions(-)

diff --git a/app-backup/backuppc/backuppc-3.3.0-r2.ebuild 
b/app-backup/backuppc/backuppc-3.3.0-r2.ebuild
new file mode 100644
index 000..7ea269c
--- /dev/null
+++ b/app-backup/backuppc/backuppc-3.3.0-r2.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils systemd webapp user
+
+MY_P="BackupPC-${PV}"
+
+DESCRIPTION="A high-performance system for backing up computers to a server's 
disk"
+HOMEPAGE="http://backuppc.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm x86"
+
+IUSE="rss samba"
+
+DEPEND="dev-lang/perl
+   app-admin/apache-tools
+   app-admin/makepasswd"
+RDEPEND="${DEPEND}
+   virtual/perl-IO-Compress
+   dev-perl/Archive-Zip
+   dev-perl/libwww-perl
+   >=app-arch/tar-1.13.20
+   app-arch/par2cmdline
+   app-arch/gzip
+   app-arch/bzip2
+   virtual/mta
+   www-apache/mod_perl
+   www-servers/apache
+   net-misc/rsync
+   >=dev-perl/File-RsyncP-0.68
+   rss? ( dev-perl/XML-RSS )
+   samba? ( net-fs/samba )"
+
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+CONFDIR="/etc/BackupPC"
+DATADIR="/var/lib/backuppc"
+LOGDIR="/var/log/BackupPC"
+
+pkg_setup() {
+   webapp_pkg_setup
+   enewgroup backuppc
+   enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
+}
+
+src_prepare() {
+   epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
+   epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
+   epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
+
+   # Fix the documentation location in the CGI interface
+   epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
+   sed -i "s+__DOCDIR__+/usr/share/doc/${PF}+" "lib/BackupPC/CGI/View.pm"
+
+   epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
+   sed -i -e 's/--chuid ${USER}//' "${S}"/init.d/src/gentoo-backuppc || 
die "Failed to fix the init script"
+}
+
+src_test() {
+   true
+}
+
+src_install() {
+   webapp_src_preinst
+
+   local myconf
+   myconf=""
+   if use samba ; then
+   myconf="--bin-path smbclient=$(type -p smbclient)"
+   myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
+   fi
+
+   /usr/bin/env perl ./configure.pl \
+   --batch \
+   --bin-path perl=$(type -p perl) \
+   --bin-path tar=$(type -p tar) \
+   --bin-path rsync=$(type -p rsync) \
+   --bin-path ping=$(type -p ping) \
+   --bin-path df=$(type -p df) \
+   --bin-path ssh=$(type -p ssh) \
+   --bin-path sendmail=$(type -p sendmail) \
+   --bin-path hostname=$(type -p hostname) \
+   --bin-path gzip=$(type -p gzip) \
+   --bin-path bzip2=$(type -p bzip2) \
+   --config-dir ${CONFDIR} \
+   --install-dir /usr \
+   --data-dir ${DATADIR} \
+   --hostname $(hostname) \
+   --uid-ignore \
+   --dest-dir "${D%/}" \
+   --html-dir ${MY_HTDOCSDIR}/image \
+   --html-dir-url /image \
+   --cgi-dir ${MY_HTDOCSDIR} \
+   --fhs \
+   ${myconf} || die "failed the configure.pl script"
+
+   ebegin "Installing documentation"
+
+   pod2man \
+   -errors=none \
+   --section=8 \
+   --center="BackupPC manual" \
+   "${S}"/doc/BackupPC.pod backuppc.8 || die "failed to generate 
man page"
+
+   doman backuppc.8
+
+   # Place the documentation in the correct location
+   dodoc "${D}/usr/doc/BackupPC.html"
+   dodoc "${D}/usr/doc/BackupPC.pod"
+   rm -rf "${D}/usr/doc"
+
+   eend 0
+
+   # Setup directories
+   dodir ${CONFDIR}/pc
+
+   keepdir ${CONFDIR}
+   keepdir ${CONFDIR}/pc
+   keepdir ${DATADIR}/{trash,pool,pc,cpool}
+   keepdir ${LOGDIR}
+
+   ebegin "Setting up init.d/conf.d/systemd scripts"
+   newinitd "${S}"/init.d/gentoo-backuppc backuppc
+   newconfd "${S}"/init.d/gentoo-backuppc.conf backuppc
+   systemd_dounit

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2016-04-25 Thread Austin English 
commit: 8580aac640282aa848c37594f447333fab688062
Author: Austin English  gentoo  org>
AuthorDate: Tue Apr 26 00:00:38 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Tue Apr 26 00:00:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8580aac6

app-backup/backuppc: remove backuppc-3.3.0-r1 / backuppc-3.3.1-r1

Package-Manager: portage-2.2.26

 app-backup/backuppc/backuppc-3.3.0-r1.ebuild | 223 ---
 app-backup/backuppc/backuppc-3.3.1-r1.ebuild | 195 ---
 2 files changed, 418 deletions(-)

diff --git a/app-backup/backuppc/backuppc-3.3.0-r1.ebuild 
b/app-backup/backuppc/backuppc-3.3.0-r1.ebuild
deleted file mode 100644
index 1183720..000
--- a/app-backup/backuppc/backuppc-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils systemd webapp user
-
-MY_P="BackupPC-${PV}"
-
-DESCRIPTION="A high-performance system for backing up computers to a server's 
disk"
-HOMEPAGE="http://backuppc.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="rss samba"
-
-DEPEND="dev-lang/perl
-   app-admin/apache-tools
-   app-admin/makepasswd"
-RDEPEND="${DEPEND}
-   virtual/perl-IO-Compress
-   dev-perl/Archive-Zip
-   dev-perl/libwww-perl
-   >=app-arch/tar-1.13.20
-   app-arch/par2cmdline
-   app-arch/gzip
-   app-arch/bzip2
-   virtual/mta
-   www-apache/mod_perl
-   www-servers/apache
-   net-misc/rsync
-   >=dev-perl/File-RsyncP-0.68
-   rss? ( dev-perl/XML-RSS )
-   samba? ( net-fs/samba )"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-CONFDIR="/etc/BackupPC"
-DATADIR="/var/lib/backuppc"
-LOGDIR="/var/log/BackupPC"
-
-pkg_setup() {
-   webapp_pkg_setup
-   enewgroup backuppc
-   enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
-}
-
-src_prepare() {
-   epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
-   epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
-   epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
-
-   # Fix the documentation location in the CGI interface
-   epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
-   sed -i "s+__DOCDIR__+/usr/share/doc/${PF}+" "lib/BackupPC/CGI/View.pm"
-
-   epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
-   sed -i -e 's/--chuid ${USER}//' "${S}"/init.d/src/gentoo-backuppc || 
die "Failed to fix the init script"
-}
-
-src_test() {
-   true
-}
-
-src_install() {
-   webapp_src_preinst
-
-   local myconf
-   myconf=""
-   if use samba ; then
-   myconf="--bin-path smbclient=$(type -p smbclient)"
-   myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
-   fi
-
-   /usr/bin/env perl ./configure.pl \
-   --batch \
-   --bin-path perl=$(type -p perl) \
-   --bin-path tar=$(type -p tar) \
-   --bin-path rsync=$(type -p rsync) \
-   --bin-path ping=$(type -p ping) \
-   --bin-path df=$(type -p df) \
-   --bin-path ssh=$(type -p ssh) \
-   --bin-path sendmail=$(type -p sendmail) \
-   --bin-path hostname=$(type -p hostname) \
-   --bin-path gzip=$(type -p gzip) \
-   --bin-path bzip2=$(type -p bzip2) \
-   --config-dir ${CONFDIR} \
-   --install-dir /usr \
-   --data-dir ${DATADIR} \
-   --hostname $(hostname) \
-   --uid-ignore \
-   --dest-dir "${D%/}" \
-   --html-dir ${MY_HTDOCSDIR}/image \
-   --html-dir-url /image \
-   --cgi-dir ${MY_HTDOCSDIR} \
-   --fhs \
-   ${myconf} || die "failed the configure.pl script"
-
-   ebegin "Installing documentation"
-
-   pod2man \
-   -errors=none \
-   --section=8 \
-   --center="BackupPC manual" \
-   "${S}"/doc/BackupPC.pod backuppc.8 || die "failed to generate 
man page"
-
-   doman backuppc.8
-
-   # Place the documentation in the correct location
-   dodoc "${D}/usr/doc/BackupPC.html"
-   dodoc "${D}/usr/doc/BackupPC.pod"
-   rm -rf "${D}/usr/doc"
-
-   eend 0
-
-   # Setup directories
-   dodir ${CONFDIR}/pc
-
-   keepdir ${CONFDIR}
-   keepdir ${CONFDIR}/pc
-   keepdir ${DATADIR}/{trash,pool,pc,cpool}
-   keepdir ${LOGDIR}
-
-   ebegin "Setting up init.d/conf.d/systemd scripts"
-   newinitd "${S}"/init.d/gentoo-backuppc backuppc
-   newconfd "${S}"/init.d/gentoo-backuppc.conf backuppc
-   systemd_dounit "${FILESDIR}/${PN}.service"
-   eend 0
-
-   ebegin "Setting up an apache instance for backuppc"
-
-   cp

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2016-01-25 Thread Michael Orlitzky 
commit: f967f889a9a09ee2ad55e8d2ccc1525b7dd8d7a9
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Jan 25 14:26:02 2016 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jan 25 14:27:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f967f889

app-backup/backuppc: un-remove systemd service file in v3.3.1.

For some reason lost to time, I omitted the installation of the
systemd service file from backuppc-3.3.1.ebuild. Erik Zeek reported
the omission and provided a fix in bug 572818.

Gentoo-Bug: 572818
Reported-by: Erik Zeek

Package-Manager: portage-2.2.26

 .../backuppc/{backuppc-3.3.1.ebuild => backuppc-3.3.1-r1.ebuild} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r1.ebuild
similarity index 97%
rename from app-backup/backuppc/backuppc-3.3.1.ebuild
rename to app-backup/backuppc/backuppc-3.3.1-r1.ebuild
index f7c0711..a40e0ae 100644
--- a/app-backup/backuppc/backuppc-3.3.1.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit depend.apache eutils user
+inherit depend.apache eutils user systemd
 
 MY_P="BackupPC-${PV}"
 
@@ -137,9 +137,10 @@ src_install() {
keepdir "${DATADIR}"/{trash,pool,pc,cpool}
keepdir "${LOGDIR}"
 
-   ebegin "Setting up init.d/conf.d scripts"
+   ebegin "Setting up init.d/conf.d/systemd scripts"
newinitd "${S}"/init.d/gentoo-backuppc backuppc
newconfd "${S}"/init.d/gentoo-backuppc.conf backuppc
+   systemd_dounit "${FILESDIR}/${PN}.service"
 
insinto "${APACHE_MODULES_CONFDIR}"
doins "${FILESDIR}"/99_backuppc.conf

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/, app-backup/backuppc/files/

2016-01-18 Thread Michael Orlitzky 
commit: b3ff61af65df489d597ae5e3d9d765500e5e5eaf
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Jan 18 23:58:30 2016 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jan 19 00:02:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ff61af

app-backup/backuppc: add version 3.3.1 (masked) with apache-2.4 support.

This new version adds apache-2.4 support to backuppc, but at the cost
of requiring www-apache/mpm_itk and a new mod_perl supporting
apache-2.4. The former is available and less onerous than the current
requirement of a separate web server. However, the only mod_perl
supporting apache-2.4 at the moment is masked, so the new version of
backuppc is masked as well.

The configuration for the new version should be more familiar to
users: it is enabled by passing -D BACKUPPC to apache2.

Gentoo-Bug: 532718
Gentoo-Bug: 541312

Package-Manager: portage-2.2.26

 app-backup/backuppc/Manifest   |   1 +
 app-backup/backuppc/backuppc-3.3.1.ebuild  | 194 +
 app-backup/backuppc/files/99_backuppc.conf |  32 +
 3 files changed, 227 insertions(+)

diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index cee7799..07d6999 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -1 +1,2 @@
 DIST BackupPC-3.3.0.tar.gz 554155 SHA256 
8a9c1b6faa4502b4c40617be97e806813815d9e22544854d99983c3da7c1f69b SHA512 
67ec1ca4d22ab1e81f9c0f409c758347a6c772e3d1aa39c93207f9d328176ac7b4e679d0b03972fc5870c37dde0480d28c61ae19975d54e144235ea0e84e9901
 WHIRLPOOL 
23a9ce5dd600843cea72354e1afe595e3779f883839f8d3feca7f1355ed20048026090097ddfbcf394632672b42bef4884bc6661203542d6fe2c6bc2e8ad7b96
+DIST BackupPC-3.3.1.tar.gz 556461 SHA256 
c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c SHA512 
b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6
 WHIRLPOOL 
1d895f530932fc1287cde9db584befc6ca0850b5841cc4e60927442d0db662ec092bda4efa4953650d3bfa13deb6e9fafa25c10f82e19b39c67969bb4e143bac

diff --git a/app-backup/backuppc/backuppc-3.3.1.ebuild 
b/app-backup/backuppc/backuppc-3.3.1.ebuild
new file mode 100644
index 000..f7c0711
--- /dev/null
+++ b/app-backup/backuppc/backuppc-3.3.1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit depend.apache eutils user
+
+MY_P="BackupPC-${PV}"
+
+DESCRIPTION="High-performance backups to a server's disk"
+HOMEPAGE="http://backuppc.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="rss samba"
+
+# The CGI modules are handled in $RDEPEND.
+APACHE_MODULES="apache2_modules_alias," # RedirectMatch
+APACHE_MODULES+="apache2_modules_authn_core," # AuthType
+APACHE_MODULES+="apache2_modules_authz_core," # Require
+APACHE_MODULES+="apache2_modules_authz_host," # Require host
+APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
+
+DEPEND="dev-lang/perl
+   app-admin/apache-tools
+   app-admin/makepasswd"
+
+# Older versions of mod_perl think they're compatibile with apache-2.4,
+# so we require the new one explicitly.
+RDEPEND="${DEPEND}
+   virtual/perl-IO-Compress
+   dev-perl/Archive-Zip
+   dev-perl/libwww-perl
+   app-arch/tar
+   app-arch/par2cmdline
+   app-arch/gzip
+   app-arch/bzip2
+   virtual/mta
+   >=www-apache/mod_perl-2.0.9
+   www-apache/mpm_itk
+   || ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
+   net-misc/rsync
+   dev-perl/File-RsyncP
+   rss? ( dev-perl/XML-RSS )
+   samba? ( net-fs/samba )"
+
+need_apache2_4
+
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+CGIDIR="/usr/lib/backuppc/htdocs"
+CONFDIR="/etc/BackupPC"
+DATADIR="/var/lib/backuppc"
+DOCDIR="/usr/share/doc/${PF}"
+LOGDIR="/var/log/BackupPC"
+
+pkg_setup() {
+   enewgroup backuppc
+   enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
+}
+
+src_prepare() {
+   epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
+   epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
+   epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
+
+   epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
+   epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
+
+   # Fix docs location using the marker that we've patched in.
+   sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
+   || die "failed to sed the documentation location"
+}
+
+src_install() {
+   local myconf
+   myconf=""
+   if use samba ; then
+   myconf="--bin-path smbclient=$(type -p smbclient)"
+

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2015-11-22 Thread Markus Meier 
commit: 6c1715a9390e67ff0f23f40bd0eb1ec963341045
Author: Markus Meier  gentoo  org>
AuthorDate: Sun Nov 22 08:03:33 2015 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sun Nov 22 08:03:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1715a9

app-backup/backuppc: add ~arm, bug #549968

Package-Manager: portage-2.2.25
RepoMan-Options: --include-arches="arm"

 app-backup/backuppc/backuppc-3.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/backuppc/backuppc-3.3.0-r1.ebuild 
b/app-backup/backuppc/backuppc-3.3.0-r1.ebuild
index e479b09..1183720 100644
--- a/app-backup/backuppc/backuppc-3.3.0-r1.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://backuppc.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 IUSE="rss samba"