Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/bacula/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.51 2013/05/31 12:41:59 wiz Exp $
# $NetBSD: Makefile,v 1.56 2014/02/12 23:18:38 tron Exp $
PKGREVISION= 8
PKGREVISION= 1
CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]*
@@ -39,7 +39,7 @@ REPLACE_PERL+= src/cats/make_catalog_backup.pl.in
.include "Makefile.common"
.if !empty(USE_DESTDIR:M[Yy][Ee][Ss])
INSTALL_MAKE_FLAGS+= dir_user= dir_group=
INSTALL_MAKE_FLAGS+= dir_user= dir_group= sd_group=
.endif
post-install:

12
sysutils/bacula/Makefile.common
View File

@@ -1,10 +1,10 @@
# $NetBSD: Makefile.common,v 1.61 2013/03/04 21:57:21 wiz Exp $
# $NetBSD: Makefile.common,v 1.64 2014/01/14 10:58:17 markd Exp $
#
# used by sysutils/bacula-clientonly/Makefile
# used by sysutils/bacula-tray-monitor/Makefile
# used by sysutils/bacula-wx-console/Makefile
DISTNAME= bacula-5.2.12
DISTNAME= bacula-5.2.13
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula
CONFIGURE_ARGS+= --with-sbin-perm=0755
CONFIGURE_ARGS+= --with-working-dir=${BACULA_WORKINGDIR}
CONFIGURE_ARGS+= --with-pid-dir=${BACULA_PIDDIR}
CONFIGURE_ARGS+= --with-readline=${PREFIX}/include/readline
CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}/include/readline
.if ${OPSYS} == "Linux"
CONFIGURE_ARGS+= --enable-smartalloc
@@ -73,10 +73,8 @@ PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
EXAMPLESDIR= ${PREFIX}/share/examples/bacula
INSTALLATION_DIRS+= ${EXAMPLESDIR}
pre-install:
${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLESDIR}
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/readline.buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"

3
sysutils/bacula/PLIST.common
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.common,v 1.17 2013/05/19 11:00:03 shattered Exp $
@comment $NetBSD: PLIST.common,v 1.18 2014/03/11 14:05:14 jperkin Exp $
lib/bpipe-fd.la
lib/libbac.la
lib/libbaccfg.la
@@ -48,4 +48,3 @@ share/doc/bacula/VERIFYING
share/doc/bacula/technotes
share/examples/bacula/bacula-fd.conf
share/examples/bacula/bconsole.conf
share/examples/rc.d/bacula-fd

5
sysutils/bacula/PLIST.server
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.server,v 1.12 2013/05/19 11:00:03 shattered Exp $
@comment $NetBSD: PLIST.server,v 1.13 2014/03/11 14:05:14 jperkin Exp $
lib/libbaccats.la
lib/libbaccats-${BACULA_DB}.la
lib/libbacsql.la
@@ -31,6 +31,3 @@ sbin/bwild
sbin/dbcheck
share/examples/bacula/bacula-dir.conf
share/examples/bacula/bacula-sd.conf
share/examples/rc.d/bacula
share/examples/rc.d/bacula-dir
share/examples/rc.d/bacula-sd

15
sysutils/bacula/distinfo
View File

@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.47 2012/10/06 17:54:53 christos Exp $
$NetBSD: distinfo,v 1.51 2014/02/01 19:41:31 joerg Exp $
SHA1 (bacula-5.2.12.tar.gz) = c53cdd185f5f4075ddcca0971953319a94276c84
RMD160 (bacula-5.2.12.tar.gz) = dd5b9f457a524acd9cdbbe0c4842670c4ee5bd5a
Size (bacula-5.2.12.tar.gz) = 4147847 bytes
SHA1 (bacula-5.2.13.tar.gz) = 30b1eb2efb515138807163d046f675eaa29fad1c
RMD160 (bacula-5.2.13.tar.gz) = bcc168143c0eec5cb5e983f765935534379f4fcf
Size (bacula-5.2.13.tar.gz) = 4243395 bytes
SHA1 (patch-ac) = 4ba89bcf49ce82b527edc789e2b17a781cb8622e
SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01
SHA1 (patch-ah) = 06452df1449ed6f06af00ed2cf9d736c40044dfb
@@ -10,12 +10,15 @@ SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee
SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2
SHA1 (patch-am) = 28536d3f0de81940773749c3704ad7aca86d374d
SHA1 (patch-configure) = 710d6e4370099a5d6d23d1297864af01abcdae83
SHA1 (patch-src_console_conio.c) = 281d1f4c972744a936733f2a0003c6b0f993904d
SHA1 (patch-src_bacula.h) = 74fed45f9d441a132f113fdfd783b8f5bb077885
SHA1 (patch-src_console_conio.c) = bfec27296d145ab94c305cc5ffca7f892c14303e
SHA1 (patch-src_dird_Makefile.in) = fdce18aca972f26f16af90283756cd5bf5ad5831
SHA1 (patch-src_filed_Makefile.in) = c88ee648ef33c3f7c3a02b77b1d3fc3da8da088d
SHA1 (patch-src_findlib_attribs.c) = a0917e500d7e937164cf59917cabd992512acd1d
SHA1 (patch-src_lib_attr.c) = 287851ff2ce2a0868d597cf1d7471a6766f6f7c1
SHA1 (patch-src_lib_md5.c) = a359bb9988538f02d5a14bf3ddac23f7ea64bea6
SHA1 (patch-src_plugins_fd_Makefile.in) = f1316cdbb66d9bc55d8adbd4b0bbde01443ccd2e
SHA1 (patch-src_plugins_fd_fd__common.h) = 7c8419d4fa7f1fe8a07e2bc2720a4903ff324135
SHA1 (patch-src_qt-console_bat.pro.in) = 8df9381c0b35b5a3dcd237f8c017ae21d88c79ad
SHA1 (patch-src_stored_Makefile.in) = 5bee8ea8a7c288a1e4baf372ef79da34c9e35284
SHA1 (patch-src_tools_Makefile.in) = 9fbc8d0f71f34217ea29f6ae04cbd927d5ac275b
SHA1 (patch-src_tools_Makefile.in) = dca0472c31ced76b8d5a357ef968ddc3f93faf5b

13
sysutils/bacula/patches/patch-src_bacula.h Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_bacula.h,v 1.1 2014/02/01 19:41:31 joerg Exp $
--- src/bacula.h.orig 2014-01-31 20:01:28.000000000 +0000
+++ src/bacula.h
@@ -186,6 +186,8 @@ extern "C" {
#undef _
#undef free
#undef malloc
+#undef Enter
+#undef Leave
#endif
#if defined(HAVE_WIN32)

19
sysutils/bacula/patches/patch-src_console_conio.c
View File

@@ -1,19 +1,26 @@
$NetBSD: patch-src_console_conio.c,v 1.1 2012/10/06 17:54:53 christos Exp $
$NetBSD: patch-src_console_conio.c,v 1.3 2014/01/22 10:45:21 jperkin Exp $
- need termios.h, our term.h does not include it
- t_insert_line and t_delete_line are macros in term.h; undef them
- spell HAVE_TERM_H correctly
--- src/console/conio.c.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/console/conio.c 2012-10-05 11:29:38.000000000 -0400
@@ -61,6 +61,7 @@
--- src/console/conio.c.orig 2013-02-19 19:21:35.000000000 +0000
+++ src/console/conio.c
@@ -64,11 +64,12 @@
#endif
#ifdef HAVE_CONIO
+#include <termios.h>
#include <curses.h>
#include <term.h>
@@ -245,7 +246,9 @@
#if defined(HAVE_SUN_OS)
-#if !defined(_TERM_H)
+#if !defined(HAVE_TERM_H)
extern "C" int tgetent(void *, const char *);
extern "C" int tgetnum(const char *);
extern "C" char *tgetstr (const char*, char**);
@@ -250,7 +251,9 @@ static char * getnext(void);
static char * getprev(void);
static void putline(char *newl, int newlen);
static void t_honk_horn(void);

13
sysutils/bacula/patches/patch-src_lib_md5.c Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_lib_md5.c,v 1.1 2013/11/06 16:00:05 joerg Exp $
--- src/lib/md5.c.orig 2013-11-06 15:37:34.000000000 +0000
+++ src/lib/md5.c
@@ -173,7 +173,7 @@ void MD5Final(unsigned char digest[16],
MD5Transform(ctx->buf, (uint32_t *) ctx->in);
byteReverse((unsigned char *) ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}

54
sysutils/bacula/patches/patch-src_plugins_fd_fd__common.h Normal file
View File

@@ -0,0 +1,54 @@
$NetBSD: patch-src_plugins_fd_fd__common.h,v 1.1 2013/11/06 16:00:05 joerg Exp $
Replacements for new and delete must be global according to ISO C++.
This file is only used by a test case, so just drop them.
--- src/plugins/fd/fd_common.h.orig 2013-11-06 15:38:19.000000000 +0000
+++ src/plugins/fd/fd_common.h
@@ -71,46 +71,6 @@ DLL_IMP_EXP void reallyfree(const char *
#define malloc(s) sm_malloc(__FILE__, __LINE__, (s))
#define free(o) sm_free(__FILE__, __LINE__, (o))
-inline void *operator new(size_t size, char const * file, int line)
-{
- void *pnew = sm_malloc(file,line, size);
- memset((char *)pnew, 0, size);
- return pnew;
-}
-
-inline void *operator new[](size_t size, char const * file, int line)
-{
- void *pnew = sm_malloc(file, line, size);
- memset((char *)pnew, 0, size);
- return pnew;
-}
-
-inline void *operator new(size_t size)
-{
- void *pnew = sm_malloc(__FILE__, __LINE__, size);
- memset((char *)pnew, 0, size);
- return pnew;
-}
-
-inline void *operator new[](size_t size)
-{
- void *pnew = sm_malloc(__FILE__, __LINE__, size);
- memset((char *)pnew, 0, size);
- return pnew;
-}
-
-#define new new(__FILE__, __LINE__)
-
-inline void operator delete(void *buf)
-{
- sm_free( __FILE__, __LINE__, buf);
-}
-
-inline void operator delete[] (void *buf)
-{
- sm_free(__FILE__, __LINE__, buf);
-}
-
#define Dmsg(context, level, ...) bfuncs->DebugMessage(context, __FILE__, __LINE__, level, __VA_ARGS__ )
#define Jmsg(context, type, ...) bfuncs->JobMessage(context, __FILE__, __LINE__, type, 0, __VA_ARGS__ )

20
sysutils/bacula/patches/patch-src_tools_Makefile.in
View File

@@ -1,20 +1,20 @@
$NetBSD: patch-src_tools_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $
$NetBSD: patch-src_tools_Makefile.in,v 1.2 2014/01/14 10:58:17 markd Exp $
- use the .la files for linking
- remove tests that don't link (using functions not in libraries)
--- src/tools/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400
+++ src/tools/Makefile.in 2012-10-05 11:13:02.000000000 -0400
@@ -37,7 +37,7 @@
--- src/tools/Makefile.in.orig 2013-02-19 19:21:35.000000000 +0000
+++ src/tools/Makefile.in
@@ -35,7 +35,7 @@ EXTRAOBJS = @OBJLIST@
DIRCONFOBJS = ../dird/dird_conf.o ../dird/ua_acl.o ../dird/run_conf.o ../dird/inc_conf.o
NODIRTOOLS = bsmtp
-DIRTOOLS = bsmtp dbcheck drivetype fstype testfind testls bregex bwild bbatch bregtest bvfs_test ing_test bpluginfo
+DIRTOOLS = bsmtp dbcheck drivetype fstype testfind bregex bwild bbatch bregtest ing_test bpluginfo
-DIRTOOLS = bsmtp dbcheck drivetype fstype testfind testls bregex bwild bbatch bregtest bvfs_test ing_test bpluginfo timelimit
+DIRTOOLS = bsmtp dbcheck drivetype fstype testfind bregex bwild bbatch bregtest ing_test bpluginfo timelimit
TOOLS = $(@DIR_TOOLS@)
INSNODIRTOOLS = bsmtp
@@ -58,22 +58,22 @@
@@ -56,22 +56,22 @@ all: Makefile $(TOOLS) gigaslam grow
@echo " "
bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@@ -42,7 +42,7 @@ $NetBSD: patch-src_tools_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $
$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
dird_conf.o: ../dird/dird_conf.c
@@ -91,34 +91,34 @@
@@ -93,34 +93,34 @@ timelimit: timelimit.o
testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \
@@ -84,7 +84,7 @@ $NetBSD: patch-src_tools_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $
cats_test.o: cats_test.c
echo "Compiling $<"
@@ -126,7 +126,7 @@
@@ -128,7 +128,7 @@ cats_test.o: cats_test.c
cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o \
@@ -93,7 +93,7 @@ $NetBSD: patch-src_tools_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $
gigaslam.o: gigaslam.c
$(CXX) $(CFLAGS) -c $<
@@ -135,13 +135,13 @@
@@ -137,13 +137,13 @@ gigaslam: gigaslam.o
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)