diff options
author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-07-03 00:24:59 +0300 |
---|---|---|
committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-07-03 00:24:59 +0300 |
commit | 93c635278af5f1bb4a20cea818bd668b86a89417 (patch) | |
tree | 9b0182be88c142fbf5e82af873698b794f9d3f95 | |
parent | cbb1f5e2f47da83209867b6bbfad1841ee70f8a5 (diff) |
bacula-scm added
tox: fixed econf vars
20 files changed, 722 insertions, 1 deletions
diff --git a/metadata/categories.conf b/metadata/categories.conf index 45e1a0b..f9c50d4 100644 --- a/metadata/categories.conf +++ b/metadata/categories.conf @@ -16,3 +16,4 @@ media net-vpn net-misc net-print +app-backup diff --git a/packages/app-backup/bacula/bacula-scm.exheres-0 b/packages/app-backup/bacula/bacula-scm.exheres-0 new file mode 100644 index 0000000..42604cb --- /dev/null +++ b/packages/app-backup/bacula/bacula-scm.exheres-0 @@ -0,0 +1,248 @@ +# Distributed under the terms of the GNU General Public License v2 + + +SCM_REPOSITORY="http://git.bacula.org/bacula.git" +SCM_BRANCH="Branch-9.0" +require scm-git systemd-service qmake [ slot=5 ] +require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.13 1.12 1.11 ] need_libtool=true ] + +DOWNLOADS="" +SLOT="0" +PLATFORMS="~amd64 ~x86" + +SUMMARY="Featureful client/server network backup suite" +HOMEPAGE="http://www.bacula.org/" +LICENCES="AGPL-3" + +MYOPTIONS=" + acl + bacula-clientonly + bacula-nodir + bacula-nosd + examples + ipv6 + logwatch + qt5 + readline + ssl + tcpd + vim-syntax + X + ssl? ( providers: + libressl + openssl + ) + [[ number-selected = exactly-one ]] + !bacula-clientonly? ( + mysql + postgres + sqlite + ) + [[ number-selected = exactly-one ]] +" + +DEPENDENCIES=" + build: + dev-libs/gmp + !bacula-clientonly? ( + postgres? ( dev-db/postgresql ) + mysql? ( virtual/mysql ) + sqlite? ( dev-db/sqlite ) + !bacula-nodir? ( virtual/mta ) + ) + qt5? ( + x11-libs/qwt[qt5] + x11-libs/qtsvg:5 + ) + logwatch? ( sys-apps/logwatch ) + tcpd? ( sys-apps/tcp-wrappers ) + readline? ( sys-libs/readline ) + acl? ( sys-apps/acl ) + sys-libs/zlib + app-arch/lzo + sys-libs/ncurses + ssl? ( + providers:libressl? ( dev-libs/libressl ) + providers:openssl? ( dev-libs/openssl ) + ) + build+run: + !bacula-clientonly? ( + !bacula-nosd? ( + sys-block/mtx + app-arch/mt-st + ) + + ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) +" + +WORK="${WORK}"/bacula + +pkg_setup() { + option mysql && export mydbtype="mysql" + option postgres && export mydbtype="postgresql" + option sqlite && export mydbtype="sqlite3" + #TODO: create group and user +} + +src_prepare() { + edo pushd src >&/dev/null + for f in console/console.c dird/dird.c filed/filed.c \ + stored/bcopy.c stored/bextract.c stored/bls.c \ + stored/bscan.c stored/btape.c stored/stored.c \ + qt-console/main.cpp; do + edo sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" + done + popd >&/dev/null || die + edo sed -i -e 's/Application;//' scripts/bat.desktop.in + edo sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in + expatch -p0 "${FILES}"/7.2.0/${PN}-7.2.0-doc.patch + expatch "${FILES}"/5.2.3/${PN}-5.2.3-as-needed.patch + expatch -p0 "${FILES}"/9.0.2/${PN}-9.0.2-lib-search-path.patch + expatch -p0 "${FILES}"/9.0.6/${PN}-9.0.6-bat-pro.patch + expatch -p0 "${FILES}"/5.2.3/${PN}-5.2.3-openssl-1.patch + expatch -p0 "${FILES}/bacula-fix-sonames.patch" + edo sed -i -e "s/strip /# strip /" src/filed/Makefile.in + edo sed -i -e "s/strip /# strip /" src/console/Makefile.in + expatch -p0 "${FILES}"/7.0.2/${PN}-7.0.2-depend.patch + edo sed -i -e '/Requires/d' platforms/systemd/*.service.in + edo sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in + edo sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in + edo sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in + edo sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ + src/qt-console/bat.pro.in + edo mkdir src/qt-console/.libs + edo touch src/qt-console/.libs/bat + edo chmod 755 src/qt-console/.libs/bat + expatch -p0 "${FILES}"/9.0.6/${PN}-9.0.6-libressl.patch + edo mv autoconf/libtool autoconf/libtool1 + + default +} + +src_configure() { + local myconf=() + if option bacula-clientonly; then + myconf+=( + $(option_enable bacula-clientonly client-only) + ) + else + myconf+=( + $(option_enable !bacula-nodir build-dird) + $(option_enable !bacula-nosd build-stored) + --with-${mydbtype} + ) + if option mysql; then + myconf+=( --disable-batch-insert ) + else + myconf+=( --enable-batch-insert ) + fi + fi + econf \ + "${myconf[@]}" \ + $(option_enable qt5 bat) \ + $(option_with X x) \ + $(option_enable !readline conio) \ + $(option_enable readline) \ + $(option_with ssl openssl) \ + $(option_enable acl) \ + $(option_enable ipv6) \ + $(option_with tcpd tcp-wrappers) \ + --with-dir-user=bacula \ + --with-dir-group=bacula \ + --with-sd-user=root \ + --with-sd-group=bacula \ + --with-fd-user=root \ + --with-fd-group=bacula \ + --enable-smartalloc \ + --disable-afs \ + +} + +src_compile() { + emake NO_ECHO="" +} + +src_install() { + default + rm -f "${IMAGE}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql} + + # extra files which 'make install' doesn't cover + if ! option bacula-clientonly; then + # the database update scripts + diropts -m0750 + insinto "${IMAGE}"/usr/$(exhost --target)/libexec/bacula/updatedb + insopts -m0754 + doins "${WORK}"/updatedb/* + fperms 0640 "${IMAGE}"/usr/$(exhost --target)/libexec/bacula/updatedb/README + + # the logrotate configuration + # (now unconditional wrt bug #258187) + diropts -m0755 + insinto "${IMAGE}"/etc/logrotate.d + insopts -m0644 + newins "${WORK}"/scripts/logrotate bacula + + # the logwatch scripts + if option logwatch; then + diropts -m0750 + dodir /usr/share/logwatch/scripts/services + dodir /usr/share/logwatch/scripts/shared + dodir /etc/logwatch/conf/logfiles + dodir /etc/logwatch/conf/services + edo pushd "${WORK}"/scripts/logwatch >&/dev/null + emake install + popd >&/dev/null || die + fi + fi + + if ! option qt5; then + rm -vf "${IMAGE}"/usr/share/man/man1/bat.1* + fi + + rm -vf "${IMAGE}"/usr/share/man/man1/bacula-tray-monitor.1* + + if option bacula-clientonly || option bacula-nodir; then + rm -vf "${IMAGE}"/usr/share/man/man8/bacula-dir.8* + rm -vf "${IMAGE}"/usr/share/man/man8/dbcheck.8* + rm -vf "${IMAGE}"/usr/share/man/man1/bsmtp.1* + rm -vf "${IMAGE}"/usr/libexec/bacula/create_*_database + rm -vf "${IMAGE}"/usr/libexec/bacula/drop_*_database + rm -vf "${IMAGE}"/usr/libexec/bacula/make_*_tables + rm -vf "${IMAGE}"/usr/libexec/bacula/update_*_tables + rm -vf "${IMAGE}"/usr/libexec/bacula/drop_*_tables + rm -vf "${IMAGE}"/usr/libexec/bacula/grant_*_privileges + rm -vf "${IMAGE}"/usr/libexec/bacula/*_catalog_backup + fi + if option bacula-clientonly || option bacula-nosd; then + rm -vf "${IMAGE}"/usr/share/man/man8/bacula-sd.8* + rm -vf "${IMAGE}"/usr/share/man/man8/bcopy.8* + rm -vf "${IMAGE}"/usr/share/man/man8/bextract.8* + rm -vf "${IMAGE}"/usr/share/man/man8/bls.8* + rm -vf "${IMAGE}"/usr/share/man/man8/bscan.8* + rm -vf "${IMAGE}"/usr/share/man/man8/btape.8* + rm -vf "${IMAGE}"/usr/libexec/bacula/disk-changer + rm -vf "${IMAGE}"/usr/libexec/bacula/mtx-changer + rm -vf "${IMAGE}"/usr/libexec/bacula/dvd-handler + fi + + if option examples; then + docinto examples/ + dodoc -r examples/* + fi + + # vim-files + if option vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins scripts/bacula.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins scripts/filetype.vim bacula_ft.vim + fi + + edo rmdir "${IMAGE}"/usr/share/man/man1 + edo rmdir "${IMAGE}"/tmp + edo rmdir "${IMAGE}"/opt/bacula/log + edo rmdir "${IMAGE}"/opt/bacula/working + edo rmdir "${IMAGE}"/opt/bacula + edo rmdir "${IMAGE}"/opt +} diff --git a/packages/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch b/packages/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch new file mode 100644 index 0000000..458c188 --- /dev/null +++ b/packages/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch @@ -0,0 +1,56 @@ +--- src/console/Makefile.in.orig 2011-10-30 14:10:41.100802721 -0400 ++++ src/console/Makefile.in 2011-10-30 14:14:42.330488174 -0400 +@@ -29,10 +29,11 @@ + GETTEXT_LIBS = @LIBINTL@ + + CONS_INC=@CONS_INC@ + CONS_LIBS=@CONS_LIBS@ + CONS_LDFLAGS=@CONS_LDFLAGS@ ++ZLIBS=@ZLIBS@ + + .SUFFIXES: .c .o + .PHONY: + .DONTCARE: + +@@ -46,17 +47,17 @@ + @echo " " + + + bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + + static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) $(ZLIBS) + strip $@ + + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ +--- src/filed/Makefile.in.orig 2012-06-28 16:52:03.000000000 +0200 ++++ src/filed/Makefile.in 2012-08-16 11:08:09.000000000 +0200 +@@ -96,13 +96,13 @@ + bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) + + static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) + strip $@ + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status diff --git a/packages/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch b/packages/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch new file mode 100644 index 0000000..8c419a3 --- /dev/null +++ b/packages/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch @@ -0,0 +1,12 @@ +# fix file not found error during make depend +--- src/tools/Makefile.in.orig 2012-09-20 20:42:54.000000000 +0200 ++++ src/tools/Makefile.in 2012-09-20 20:35:46.000000000 +0200 +@@ -194,7 +194,7 @@ + @$(MV) Makefile Makefile.bak + @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile + @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile +- @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile ++ @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile + @if test -f Makefile ; then \ + $(RMF) Makefile.bak; \ + else \ diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch new file mode 100644 index 0000000..3cdee15 --- /dev/null +++ b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch @@ -0,0 +1,27 @@ +# stop build if there are errors in subdirs +--- Makefile.in.orig 2010-07-20 16:53:44.000000000 +0000 ++++ Makefile.in 2010-07-20 16:55:50.000000000 +0000 +@@ -44,9 +44,8 @@ + + all: Makefile + @for I in ${all_subdirs}; \ +- do (cd $$I; echo "==>Entering directory `pwd`"; \ +- $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ +- echo ""; echo ""; exit 1;)); \ ++ do \ ++ $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \ + done + + depend: +@@ -55,9 +54,8 @@ + + bacula-fd: Makefile + @for I in ${fd_subdirs}; \ +- do (cd $$I; echo "==>Entering directory `pwd`"; \ +- $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ +- echo ""; echo ""; exit 1;)); \ ++ do \ ++ $(MAKE) DESTDIR=$(DESTDIR) -C $$I all || exit 1; \ + done + + #------------------------------------------------------------------------- diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch new file mode 100644 index 0000000..4b52d21 --- /dev/null +++ b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch @@ -0,0 +1,14 @@ +# see bug #310087 +diff -urN bacula-5.2.1.orig/src/findlib/Makefile.in bacula-5.2.1/src/findlib/Makefile.in +--- bacula-5.2.1.orig/src/findlib/Makefile.in 2010-02-24 16:33:48.000000000 +0100 ++++ bacula-5.2.1/src/findlib/Makefile.in 2010-03-22 17:37:43.772805754 +0100 +@@ -59,7 +59,7 @@ + + libbacfind.la: Makefile $(LIBBACFIND_LOBJS) + @echo "Making $@ ..." +- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) ++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS) + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ + diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch new file mode 100644 index 0000000..98c6e6c --- /dev/null +++ b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch @@ -0,0 +1,13 @@ +# drop automatic installation of doc files +--- Makefile.in.orig 2011-02-26 09:05:21.000000000 +0000 ++++ Makefile.in 2011-02-26 09:06:01.000000000 +0000 +@@ -34,8 +34,7 @@ + autoconf/config.h.in autoconf/acconfig.h autoconf/Make.common.in \ + autoconf/install-sh autoconf/mkinstalldirs + +-doc_files = VERIFYING technotes ChangeLog README ReleaseNotes LICENSE \ +- INSTALL ++doc_files = + + MKDIR = $(srcdir)/autoconf/mkinstalldirs + LIBTOOL_DEPS = @LIBTOOL_DEPS@ diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch new file mode 100644 index 0000000..94d8fb6 --- /dev/null +++ b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch @@ -0,0 +1,11 @@ +# bat needs to respect LDFLAGS +--- src/qt-console/bat.pro.in.orig 2010-07-20 18:28:50.000000000 +0000 ++++ src/qt-console/bat.pro.in 2010-07-20 18:29:25.000000000 +0000 +@@ -26,6 +26,7 @@ + QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) + QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p + QMAKE_CLEAN += .libs/* bat ++QMAKE_LFLAGS += @LDFLAGS@ + + qwt { + INCLUDEPATH += @QWT_INC@ diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch new file mode 100644 index 0000000..c3bded4 --- /dev/null +++ b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch @@ -0,0 +1,12 @@ +# If upgrading the old libraries gets linked first. So fix order of lib search path. +--- src/console/Makefile.in.orig 2010-03-29 11:35:00.000000000 +0000 ++++ src/console/Makefile.in 2010-03-29 11:45:14.000000000 +0000 +@@ -47,7 +47,7 @@ + + + bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ + $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS) + diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch new file mode 100644 index 0000000..58d2631 --- /dev/null +++ b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch @@ -0,0 +1,25 @@ +http://bugs.gentoo.org/328701 +http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup + +--- src/lib/crypto.c ++++ src/lib/crypto.c +@@ -51,7 +51,7 @@ + * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer + * exists. It was not an official API. + */ +-#ifdef HAVE_OPENSSLv1 ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) + #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old + #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old + #endif +--- src/lib/tls.c ++++ src/lib/tls.c +@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc + extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext))); + + if (strcmp(extname, "subjectAltName") == 0) { +-#ifdef HAVE_OPENSSLv1 ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) + const X509V3_EXT_METHOD *method; + #else + X509V3_EXT_METHOD *method; diff --git a/packages/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch b/packages/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch new file mode 100644 index 0000000..e076cd6 --- /dev/null +++ b/packages/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch @@ -0,0 +1,12 @@ +# fix file not found error during make depend +--- src/tools/Makefile.in.orig 2012-09-20 20:42:54.000000000 +0200 ++++ src/tools/Makefile.in 2012-09-20 20:35:46.000000000 +0200 +@@ -194,7 +194,7 @@ + @$(MV) Makefile Makefile.bak + @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile + @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile +- @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile ++ @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile + @if test -f Makefile ; then \ + $(RMF) Makefile.bak; \ + else \ diff --git a/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch b/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch new file mode 100644 index 0000000..155746a --- /dev/null +++ b/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch @@ -0,0 +1,12 @@ +--- Makefile.in.orig 2015-09-03 20:03:22.000000000 +0200 ++++ Makefile.in 2015-09-03 20:03:50.000000000 +0200 +@@ -35,8 +35,7 @@ + autoconf/config.h.in autoconf/acconfig.h autoconf/Make.common.in \ + autoconf/install-sh autoconf/mkinstalldirs + +-doc_files = VERIFYING ChangeLog README ReleaseNotes LICENSE \ +- LICENSE-FAQ LICENSE-FOSS INSTALL ++doc_files = + + MKDIR = $(srcdir)/autoconf/mkinstalldirs + LIBTOOL_DEPS = @LIBTOOL_DEPS@ diff --git a/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch b/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch new file mode 100644 index 0000000..faf0d06 --- /dev/null +++ b/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch @@ -0,0 +1,56 @@ +--- src/console/Makefile.in.orig 2011-10-30 14:10:41.100802721 -0400 ++++ src/console/Makefile.in 2011-10-30 14:14:42.330488174 -0400 +@@ -29,10 +29,11 @@ + GETTEXT_LIBS = @LIBINTL@ + + CONS_INC=@CONS_INC@ + CONS_LIBS=@CONS_LIBS@ + CONS_LDFLAGS=@CONS_LDFLAGS@ ++ZLIBS=@ZLIBS@ + + .SUFFIXES: .c .o + .PHONY: + .DONTCARE: + +@@ -46,17 +47,17 @@ + @echo " " + + + bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + + static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) $(ZLIBS) + strip $@ + + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ +--- src/filed/Makefile.in.orig 2015-09-04 12:47:13.000000000 +0200 ++++ src/filed/Makefile.in 2015-09-04 12:49:39.000000000 +0200 +@@ -66,13 +66,13 @@ + bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) ++ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) + + static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) ++ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) + strip $@ + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status diff --git a/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch b/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch new file mode 100644 index 0000000..bf6630a --- /dev/null +++ b/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch @@ -0,0 +1,63 @@ +--- src/console/Makefile.in.orig 2017-07-25 19:03:05.664760298 +0200 ++++ src/console/Makefile.in 2017-07-25 19:05:43.576706091 +0200 +@@ -24,6 +24,7 @@ + CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@ + CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@ + JSONOBJS = bbconsjson.o console_conf.o ++ZLIBS=@ZLIBS@ + + # these are the objects that are changed by the .configure process + EXTRAOBJS = @OBJLIST@ +@@ -50,18 +51,18 @@ + + bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + + bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + + static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + strip $@ + + +--- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200 ++++ src/filed/Makefile.in 2017-07-25 19:11:39.519558592 +0200 +@@ -69,19 +69,19 @@ + bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) ++ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) + + bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) + + static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) ++ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) + strip $@ + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status diff --git a/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch b/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch new file mode 100644 index 0000000..33cf83d --- /dev/null +++ b/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch @@ -0,0 +1,25 @@ +# If upgrading the old libraries gets linked first. So fix order of +# lib search path. +--- src/console/Makefile.in.orig 2017-07-26 15:03:07.000000000 +0200 ++++ src/console/Makefile.in 2017-07-23 18:31:57.000000000 +0200 +@@ -49,17 +49,17 @@ + + + bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ + $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS) + + bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(JSONOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \ + $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS) + + static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) +- $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ ++ $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ + $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS) + strip $@ diff --git a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch new file mode 100644 index 0000000..3d055b8 --- /dev/null +++ b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch @@ -0,0 +1,21 @@ +--- src/qt-console/bat.pro.in.orig 2018-02-18 16:17:21.027921363 +0100 ++++ src/qt-console/bat.pro.in 2018-02-18 16:18:12.554137528 +0100 +@@ -12,7 +12,7 @@ + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + + bins.path = /$(DESTDIR)@sbindir@ +-bins.files = bat ++bins.files = .libs/bat + confs.path = /$(DESTDIR)@sysconfdir@ + confs.commands = ./install_conf_file + help.path = /$(DESTDIR)@docdir@ +@@ -29,6 +29,9 @@ + QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) + QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p + QMAKE_CLEAN += .libs/* bat ++QMAKE_LFLAGS += @LDFLAGS@ ++QMAKE_CFLAGS += @CFLAGS@ ++QMAKE_CXXFLAGS += @CXXFLAGS@ + + qwt { + INCLUDEPATH += @QWT_INC@ diff --git a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch new file mode 100644 index 0000000..9d6507c --- /dev/null +++ b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch @@ -0,0 +1,15 @@ +--- src/qt-console/pages.h.orig 2017-11-21 12:37:16.000000000 -0500 ++++ src/qt-console/pages.h 2018-02-07 13:11:46.223273248 -0500 +@@ -20,10 +20,11 @@ + */ + /* + * Dirk Bartley, March 2007 + */ + ++#include <QtGlobal> + #if QT_VERSION >= 0x050000 + #include <QtWidgets> + #else + #include <QtGui> + #endif + diff --git a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch new file mode 100644 index 0000000..3df4285 --- /dev/null +++ b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch @@ -0,0 +1,62 @@ +--- src/lib/crypto.c.orig 2018-02-02 15:34:39.420489000 -0600 ++++ src/lib/crypto.c 2018-02-02 15:35:44.000524000 -0600 +@@ -195,7 +195,7 @@ + IMPLEMENT_ASN1_FUNCTIONS(SignatureData) + IMPLEMENT_ASN1_FUNCTIONS(CryptoData) + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ) + DEFINE_STACK_OF(SignerInfo); + DEFINE_STACK_OF(RecipientInfo); + #else +--- src/lib/openssl-compat.h.orig 2018-02-02 15:26:04.182557000 -0600 ++++ src/lib/openssl-compat.h 2018-02-02 15:27:50.229100000 -0600 +@@ -1,7 +1,7 @@ + #ifndef __OPENSSL_COPMAT__H__ + #define __OPENSSL_COPMAT__H__ + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) + static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey) + { + CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); +--- src/lib/openssl.c.orig 2018-02-16 08:36:24.092583000 -0600 ++++ src/lib/openssl.c 2018-02-16 08:37:23.795454000 -0600 +@@ -69,7 +69,7 @@ + } + } + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) + /* Array of mutexes for use with OpenSSL static locking */ + static pthread_mutex_t *mutexes; + +@@ -263,7 +263,7 @@ + { + int stat = 0; + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) + if ((stat = openssl_init_threads()) != 0) { + berrno be; + Jmsg1(NULL, M_ABORT, 0, +@@ -310,7 +310,7 @@ + Jmsg0(NULL, M_ERROR, 0, _("Failed to save OpenSSL PRNG\n")); + } + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) + openssl_cleanup_threads(); + + /* Free libssl and libcrypto error strings */ +--- src/lib/tls.c.orig 2017-11-21 18:37:16.000000000 +0100 ++++ src/lib/tls.c 2018-04-16 20:00:54.082000000 +0200 +@@ -116,7 +116,7 @@ + ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT)); + + /* Allocate our OpenSSL TLS Context */ +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) + /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */ + ctx->openssl = SSL_CTX_new(TLS_method()); + diff --git a/packages/app-backup/bacula/files/bacula-fix-sonames.patch b/packages/app-backup/bacula/files/bacula-fix-sonames.patch new file mode 100644 index 0000000..d05b2b9 --- /dev/null +++ b/packages/app-backup/bacula/files/bacula-fix-sonames.patch @@ -0,0 +1,36 @@ +=== modified file 'autoconf/ltmain.sh' +--- autoconf/ltmain.sh 2011-11-06 20:34:58 +0000 ++++ autoconf/ltmain.sh 2012-02-09 17:27:13 +0000 +@@ -2428,6 +2428,7 @@ + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -shared only do dynamic linking of libtool libraries + -shrext SUFFIX override the standard shared library file extension ++ -soname SONAME override the standard shared object name + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries +@@ -5422,6 +5423,11 @@ + prev= + continue + ;; ++ soname) ++ soname_spec="$arg" ++ prev= ++ continue ++ ;; + weak) + func_append weak_libs " $arg" + prev= +@@ -5741,6 +5747,11 @@ + continue + ;; + ++ -soname) ++ prev=soname ++ continue ++ ;; ++ + -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + diff --git a/packages/net-libs/tox/tox-scm.exheres-0 b/packages/net-libs/tox/tox-scm.exheres-0 index 17b9162..bd835fc 100644 --- a/packages/net-libs/tox/tox-scm.exheres-0 +++ b/packages/net-libs/tox/tox-scm.exheres-0 @@ -52,7 +52,7 @@ src_configure() { $(option_enable av av ) \ $(option_enable ntox ntox ) \ $(option_enable daemon daemon ) \ - $(myconf) + "${myconf[@]}" } |