Upgrade to amanda 3.3.1.
README) Release Notes for 3.3.1: amrecover new 'settransalte' command amanda.conf new '$s' substitution in autolabel new 'max-dle-by-volume' global option new 'eject-volume' global option diskfile new '--client-verbose' argument all programs have a new '--version' argument ampgsql can take property from server configuration amgetconf can print one property of a section. s3 device new S3_SERVER_SIDE_ENCRYPTION property use multiple thread to speedup deleting a volume many bug fix Release Notes for 3.3.0: The default auth is changed to "bsdtcp", if you are using the default bsd then you must add it to your configuration: in amanda.conf in amanda-client.conf in dumptype/disklist in xinetd (if no '-auth' argument to amandad) amdump trap crtl-c, it still send the report and do cleanup if you do one crtl-c, do it more than once to abort the run S3 device use multiple threads to speedup the transfer can connect to eucalytus and google storage new NB_THREADS_BACKUP property new NB_THREADS_RECOVERY property new S3_HOST property new S3_SERVICE_PATH property new S3_SUBDOMAIN property chg-aggregate: new changer that use other changer sequentially meta-volume Add meta label in tapelist file chg-disk: new NUM-SLOT property new AUTO-CREATE-SLOT property new REMOVABLE property new MOUNT property new UMOUNT property new UMOUNT-LOCKFILE property new UMOUNT-IDLE property Change in amanda.conf new meta-autolabel option autolabel can include org, config, barcode, meta in the label new client-name option in appication and script. application and script in amanda-client.conf can be used to set default properties for application or script amlabel The label argument is no longer required, an autolabel can be generated new --meta option new --barcode option new --assign option amgtar, amstar: The path must be specified, it will not works with a device amrecover: decompression and decryption are now done on the client if compression/encryption was done on the client amtape: inventory print the current slot amanda.conf: autoflush have value "no|yes|all" script have single-execution setting Add pre-amcheck, post-amcheck, pre-estimate, post-estimate, pre-backup and post-backup to execute-on of script Add taperscan and interactivity section add 'server' value in recovery-limit add dump-limit in a dumptype amanda-client.conf add amdump-server setting. script are searched in $APPLICATION_DIR, $CONFIG_DIR//application and $CONFIG_DIR/application amservice add -s argument is also installed on client new amdumpd server service, if enable, it allow client to start a backup of itself new amdump_client program, it is use on client to start a backup of itself implement restore command in amzfs-sendrecv, it can be use with amrecover . Release Notes for 3.2.3: fix split arguments and LEOM handling amsuntar: Add SUNTAR-PATH property amstar: Add ACL property amzfs-sendrecv: Implement restore vfs-device (vtapes): LEOM property default to TRUE fix amplot amrecover take correct group when foring amandad with local auth many others small fix Release Notes for 3.2.2: Do not restore the NUL padding bytes, some program fail with them Fix driver doing nothing if taper crash early Fix taperalog *FIT no going to second volume Fix amrestore '-p' not going to next file flush even if flush threshold are not met if it save tape space fix crash in amtrmidx due to memory leak amsamba use 'Use smbclient -TF' for restore Release Notes for 3.2.1: barcode are added to the tapelist file Faster 'amadmin find', improve speed on many programs device-output-buffer-size default to a minimum of 4*block_size ssh auth use the client-port Bug fixed: "Can't opendata output stream: Connection refused" Better handling of dump to tape Corrupted 'amdump' log file, amstatus not showing correct state Execute subprocess with the config overwrite tape-device allow to set LEOM Crash in robot changer Script output property are not sent to application Release Notes for 3.2.0: Support for multiple simultaneous writes to storage devices Can write to all available drives in parallel. Works only with the new changer API. Useful if two or more volumes are used in a single run. dump direct to tape can be scheduled any time during the run, previously they were done sequencially after all dump to holding disk. enabled with the new 'taper-parallel-write' configuration option. Support for LEOM in storage devices allows splitting without partial parts, saving space. much more efficient, since parts need not be cached on disk in most cases. new, simpler splitting commands in the tapetype section part-size, part-cache-type, part-cache-dir, part-cache-max-size see amanda.conf(5) for details Amanda server configuration file changes (amanda.conf) new configuration keyword: taper-parallel-write -- How many drive amanda can write to in parallel. deprecated configuration keywords: amrecover_do_fsf amrecover_check_label The CONFIG parameter to amidxtaped is now required; this means that versions of amrecover older than 2.4.3 will be unable to recover from servers running Amanda-3.2 and later. The new dumptype and global parameters 'recovery-limit' can be used to limit which hosts may recover from a particular DLE. See amanda.conf(5) and amanda-auth(7) for more information. Several old changers have been removed - these changers will work with Amanda for the forseeable future, but are no longer included in the distribution. chg-chio chg-chs chg-iomega chg-juke chg-mcutil chg-mtx chg-null (use the new "chg-null:") chg-rait (use the new "chg-rait:{dev1,dev2}") chg-rth chg-scsi-chio chg-scsi Amvault is much improved, but still experimental: supports assembling split parts on the source volume and re-splitting them on the destination supports filtering dumps with the same syntax as amfetchdump a --fulls-only option skips all incremental dumps on the source an --export option tries to move tertiary volumes to import/export slots when completed command-line syntax has changed incompatibly; see manpage or 'amvault --help' Rewritten and improved: amoverview amcheckdump Release Notes for the 3.1.x release series: config The 'rawtapedev' keyword was removed, and the 'label_new_tapes' keyword was deprecated. New warnings for dangerous splitting configurations changer We have many changers implementing the new changer API. The new changers are faster, more reliable, and have many new features. One new features is that the changer keeps track of which label is in which slot, allowing it to locate a tape faster. But with some changers (new chg-multi or chg-robot without a barcode), it doesn't get automaticaly notified if you change the volume in a slot. In this case, you must notify the changer of it with the 'amtape update' command: amtape DailySet1 update 3-8 amtape DailySet1 update 3-8= amtape DailySet1 update 3=DailySet003 See amanda-changers(7) for more information. ndmp, dvdrw New Amanda devices - see amanda-devices(7) for more information. amsamba The default amandapass file for the amsamba application is $CONFIG_DIR/amandapass, but it is /etc/amandapass for program GNUTAR. Don't forget to move the file if you switch to the amsamba application. ampgsql, amsuntar, amraw New applications to back up PostgreSQL databases, Solaris systems, and raw device files, respectively. amtape Amtape's behavior has changed; see NEWS amrmtape Rewritten with new command-line interface; see NEWS amdevcheck New --label and --properties options give more information about device amreport New, more natural command-line interface (try 'amreport $config') Release Notes for 2.6.1p2: amtapetype: new -p option Bug Fixes S3 device driver amcheckdump file not removed from holding disk sendbackup compatibility with a 2.4.2 server handle EROFS error from tape device zfs snapshot name us the diskname fix fd allocation in amandad crash in amflush Release Notes for 2.6.1p1: amplot: better output. Don't include genversion.h in distribution tarballs. Bug Fixes S3 device driver rait device driver amstatus configure application-api compilation on some platform others small bug Release Notes for 2.6.1: Application API: Allow to easily write wrappers around any backup program, See the 'amanda-applications' man page. amgtar: Use GNU tar, it is a lot more configurable than the GNUTAR program. See 'amgtar' man page. amstar: Use star to do a backup, it work only on a partition. See 'amstar' man page. amsamba: Use smbclient to backup a cifs share, see amsamba man page. amzfs-sendrecv: Do a backup of a ZFS filesystem with 'zfs send'. Script API: Allow to run script before and after amanda process, see the 'amanda-scripts' man page. amzfs-snapshot: Do a snapshot of a ZFS filesystem, then 'amgtar' application will backup the snapshot. See 'amzfs-snapshot' man page. script-email: Simple script to send email. see 'script-email' man page. Changer API v2.0: perl-based changer interface supporting concurrent use of multiple devices and changers. currently operating in "compatibility mode," calling old changer shell scripts. under active development. Xfer API: generic library to move and filter data with maximal efficiency. can read from and write to arbitrary devices, files, etc. only used in some applications. Amanda archive format: A simple archive format that an application can use to create backup image. 'amarchiver' program to manipulate file in amanda archive format. Many improvements to report better error message to user. amtape subcommands 'slot prev' and 'slot last' are removed. Dozens more perl libraries, with more stable interfaces. Bug fixes and improvements. amgetconf '--client' option to retrieve config from amanda-client.conf on a client. Amanda configuration file changes new application-tool section new script-tool section new device section new changer section
This commit is contained in:
parent
a47dcb9886
commit
e861b82d3a
8 changed files with 110 additions and 57 deletions
|
@ -1,11 +1,11 @@
|
|||
# $NetBSD: Makefile.common,v 1.2 2011/01/03 04:10:12 schnoebe Exp $
|
||||
# $NetBSD: Makefile.common,v 1.3 2012/07/12 05:22:40 schnoebe Exp $
|
||||
|
||||
# used by wip/amanda3-common/Makefile
|
||||
# used by wip/amanda3-client/Makefile
|
||||
# used by wip/amanda3-server/Makefile
|
||||
# used by wip/amanda3-plot/Makefile
|
||||
|
||||
VERS= 3.1.3
|
||||
VERS= 3.3.1
|
||||
DISTNAME?= amanda-${VERS}
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/}
|
||||
|
|
|
@ -1,48 +1,52 @@
|
|||
@comment $NetBSD: PLIST,v 1.2 2011/01/03 04:10:12 schnoebe Exp $
|
||||
@comment $NetBSD: PLIST,v 1.3 2012/07/12 05:22:40 schnoebe Exp $
|
||||
lib/amanda/libamanda.la
|
||||
lib/amanda/libamandad.la
|
||||
lib/amanda/libamar.la
|
||||
lib/amanda/libamglue.la
|
||||
lib/amanda/libamxfer.la
|
||||
lib/charset.alias
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Archive.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/BigIntCompat.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/ClientService.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Config.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Constants.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Debug.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Feature.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Header.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/IPC/Binary.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/IPC/LineProtocol.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/MainLoop.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Paths.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Process.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Script.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Script_App.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Tests.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Util.pm
|
||||
lib/perl5/vendor_perl/5.12.0/Amanda/Xfer.pm
|
||||
lib/perl5/vendor_perl/5.12.0/auto/Amanda/Archive/libArchive.la
|
||||
lib/perl5/vendor_perl/5.12.0/auto/Amanda/Config/libConfig.la
|
||||
lib/perl5/vendor_perl/5.12.0/auto/Amanda/Debug/libDebug.la
|
||||
lib/perl5/vendor_perl/5.12.0/auto/Amanda/Feature/libFeature.la
|
||||
lib/perl5/vendor_perl/5.12.0/auto/Amanda/Header/libHeader.la
|
||||
lib/perl5/vendor_perl/5.12.0/auto/Amanda/IPC/Binary/libBinary.la
|
||||
lib/perl5/vendor_perl/5.12.0/auto/Amanda/MainLoop/libMainLoop.la
|
||||
lib/perl5/vendor_perl/5.12.0/auto/Amanda/Tests/libTests.la
|
||||
lib/perl5/vendor_perl/5.12.0/auto/Amanda/Util/libUtil.la
|
||||
lib/perl5/vendor_perl/5.12.0/auto/Amanda/Xfer/libXfer.la
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Archive.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/BigIntCompat.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/ClientService.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Config.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Config/FoldingHash.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Constants.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Debug.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Feature.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Header.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/IPC/Binary.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/IPC/LineProtocol.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/MainLoop.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Paths.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Process.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Script.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Script_App.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Tests.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Util.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Xfer.pm
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Archive/libArchive.la
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Config/libConfig.la
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Debug/libDebug.la
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Feature/libFeature.la
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Header/libHeader.la
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/IPC/Binary/libBinary.la
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/MainLoop/libMainLoop.la
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Tests/libTests.la
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Util/libUtil.la
|
||||
${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Xfer/libXfer.la
|
||||
libexec/amanda/amanda-sh-lib.sh
|
||||
man/man5/amanda-archive-format.5
|
||||
man/man5/amanda-client.conf.5
|
||||
man/man5/amanda.conf.5
|
||||
man/man7/amanda-auth.7
|
||||
man/man7/amanda-match.7
|
||||
man/man7/amanda-scripts.7
|
||||
man/man8/amanda.8
|
||||
man/man8/amarchiver.8
|
||||
man/man8/amservice.8
|
||||
man/man8/script-email.8
|
||||
sbin/amarchiver
|
||||
sbin/amservice
|
||||
share/doc/amanda/COPYRIGHT
|
||||
share/doc/amanda/ChangeLog
|
||||
share/doc/amanda/NEWS
|
||||
|
|
|
@ -1,13 +1,15 @@
|
|||
$NetBSD: distinfo,v 1.2 2011/01/03 04:10:12 schnoebe Exp $
|
||||
$NetBSD: distinfo,v 1.3 2012/07/12 05:22:40 schnoebe Exp $
|
||||
|
||||
SHA1 (amanda-3.1.3.tar.gz) = 9b2be151b9b729c7f5cc169d810812b0827d8006
|
||||
RMD160 (amanda-3.1.3.tar.gz) = affe53ba97c68b5186e1b7212175ed2ab9b8d9b7
|
||||
Size (amanda-3.1.3.tar.gz) = 3956234 bytes
|
||||
SHA1 (amanda-3.3.1.tar.gz) = 22273381f61319e46e1da9d7029ca2b3991eee98
|
||||
RMD160 (amanda-3.3.1.tar.gz) = 0d66ad25fd905901a1afd3651bd6c1e00db9af8d
|
||||
Size (amanda-3.3.1.tar.gz) = 4328574 bytes
|
||||
SHA1 (patch-ab) = a435fff82b9560015d2561f86162aa8f573101c0
|
||||
SHA1 (patch-ac) = 7ad6208dbe2ef1e094de050d02b51c8e1c0344cf
|
||||
SHA1 (patch-ad) = 14172a37abb2e6b4592863cb602a24a80ca7eaab
|
||||
SHA1 (patch-ad) = 1165b7c925902c2291bf9682047ddb8eaf6f5400
|
||||
SHA1 (patch-ag) = 0043f3e016ad3eb26a53f7a39e144f4e5bf732d0
|
||||
SHA1 (patch-ah) = 1a845e3ddfc8f458339e018c8617003b4f9ff7cb
|
||||
SHA1 (patch-ai) = f1ec4fba2606e357d453efcc57b7ab72cf2df680
|
||||
SHA1 (patch-aj) = 56f91ab88bc54e26023b85a1d5a31fe91b8a808f
|
||||
SHA1 (patch-ak) = ac79af2a57fcfa01f61d150c05df8f4c03215084
|
||||
SHA1 (patch-aj) = 385362c41ec8c242cda9d9f2beb38e4e60975f9e
|
||||
SHA1 (patch-ak) = bd5f93e9ad53e14dfe9a86198c8f03007736f432
|
||||
SHA1 (patch-common-src_glib-util.c) = 9429c375f0199e75fa3f3f019b8b1ae0d233a6dc
|
||||
SHA1 (patch-common-src_glib-util.h) = 205977a4e2d70979639e7a38c8d60b9ea04e2387
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
$NetBSD: patch-ad,v 1.1.1.1 2010/08/24 02:40:36 schnoebe Exp $
|
||||
$NetBSD: patch-ad,v 1.2 2012/07/12 05:22:41 schnoebe Exp $
|
||||
|
||||
Use the correct name for the statvfs struct.
|
||||
|
||||
--- gnulib/fsusage.c.orig 2010-08-11 22:21:13.000000000 +0000
|
||||
--- gnulib/fsusage.c.orig 2012-02-21 11:36:43.000000000 +0000
|
||||
+++ gnulib/fsusage.c
|
||||
@@ -97,7 +97,15 @@ get_fs_usage (char const *file, char con
|
||||
(void) disk; /* avoid argument-unused warning */
|
||||
#if defined STAT_STATVFS /* POSIX */
|
||||
@@ -96,7 +96,15 @@ get_fs_usage (char const *file, char con
|
||||
{
|
||||
#if defined STAT_STATVFS /* POSIX, except glibc/Linux */
|
||||
|
||||
+#if defined(__sun) && defined(__SVR4)
|
||||
+#if defined(__sun) && defined(__SRV4)
|
||||
+# if defined(_LARGEFILE64_SOURCE)
|
||||
+ statvfs64_t fsd;
|
||||
+# else
|
||||
|
|
|
@ -1,15 +1,24 @@
|
|||
$NetBSD: patch-aj,v 1.2 2011/01/03 04:10:12 schnoebe Exp $
|
||||
$NetBSD: patch-aj,v 1.3 2012/07/12 05:22:41 schnoebe Exp $
|
||||
|
||||
# fix bash-isms..
|
||||
|
||||
--- configure.orig 2010-10-04 17:56:37.000000000 +0000
|
||||
--- configure.orig 2012-02-21 11:37:52.000000000 +0000
|
||||
+++ configure
|
||||
@@ -28585,7 +28585,7 @@ fi
|
||||
@@ -21201,7 +21201,7 @@ fi
|
||||
|
||||
# Check whether --with-xsltproc-flags was given.
|
||||
if test "${with_xsltproc_flags+set}" = set; then
|
||||
if test "${with_xsltproc_flags+set}" = set; then :
|
||||
- withval=$with_xsltproc_flags; if test "x$withval" == "xno"; then
|
||||
+ withval=$with_xsltproc_flags; if test "x$withval" = "xno"; then
|
||||
XSLTPROC_FLAGS=''
|
||||
else
|
||||
if test "x$withval" != "xyes"; then
|
||||
@@ -26620,7 +26620,7 @@ if test "${with_suntar+set}" = set; then
|
||||
|
||||
else
|
||||
|
||||
- if test "x$SUNTAR" == "x"; then
|
||||
+ if test "x$SUNTAR" = "x"; then
|
||||
SUNTAR="/usr/sbin/tar"
|
||||
fi
|
||||
|
||||
|
|
|
@ -1,24 +1,24 @@
|
|||
$NetBSD: patch-ak,v 1.1.1.1 2010/08/24 02:40:36 schnoebe Exp $
|
||||
$NetBSD: patch-ak,v 1.2 2012/07/12 05:22:41 schnoebe Exp $
|
||||
|
||||
Don't try to build the sbin scripts for -common
|
||||
|
||||
--- common-src/Makefile.in.orig 2010-08-15 04:29:28.000000000 +0000
|
||||
--- common-src/Makefile.in.orig 2012-02-21 11:37:54.000000000 +0000
|
||||
+++ common-src/Makefile.in
|
||||
@@ -458,7 +458,7 @@ quoting_test_DEPENDENCIES = libamanda.la
|
||||
am_semaphore_test_OBJECTS = semaphore-test.$(OBJEXT)
|
||||
semaphore_test_OBJECTS = $(am_semaphore_test_OBJECTS)
|
||||
semaphore_test_DEPENDENCIES = libamanda.la libtestutils.la
|
||||
@@ -474,7 +474,7 @@ match_test_DEPENDENCIES = libamanda.la l
|
||||
am_quoting_test_OBJECTS = quoting-test.$(OBJEXT)
|
||||
quoting_test_OBJECTS = $(am_quoting_test_OBJECTS)
|
||||
quoting_test_DEPENDENCIES = libamanda.la libtestutils.la
|
||||
-SCRIPTS = $(amlibexec_SCRIPTS) $(sbin_SCRIPTS)
|
||||
+SCRIPTS = $(amlibexec_SCRIPTS) # $(sbin_SCRIPTS)
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config
|
||||
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@@ -1245,7 +1245,7 @@ SCRIPTS_PERL = $(sbin_SCRIPTS_PERL) $(am
|
||||
@@ -1516,7 +1516,7 @@ SCRIPTS_PERL = $(sbin_SCRIPTS_PERL) $(am
|
||||
SCRIPTS_SHELL = $(sbin_SCRIPTS_SHELL) $(amlibexec_SCRIPTS_SHELL)
|
||||
amlibexec_DATA = $(SCRIPTS_INCLUDE)
|
||||
amlibexec_SCRIPTS = $(amlibexec_SCRIPTS_PERL) $(amlibexec_SCRIPTS_SHELL)
|
||||
-sbin_SCRIPTS = $(sbin_SCRIPTS_PERL) $(sbin_SCRIPTS_SHELL)
|
||||
+sbin_SCRIPTS =
|
||||
all: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
# installation
|
||||
INSTALLPERMS_data = dest=$(sbindir) chown=amanda $(sbin_SCRIPTS) \
|
||||
|
|
23
amanda3-common/patches/patch-common-src_glib-util.c
Normal file
23
amanda3-common/patches/patch-common-src_glib-util.c
Normal file
|
@ -0,0 +1,23 @@
|
|||
$NetBSD: patch-common-src_glib-util.c,v 1.1 2012/07/12 05:22:41 schnoebe Exp $
|
||||
|
||||
Remove an unused function that conflicts with a glib 2.28+ routine
|
||||
(which has a different signature)
|
||||
|
||||
--- common-src/glib-util.c.orig 2012-02-21 11:36:51.000000000 +0000
|
||||
+++ common-src/glib-util.c
|
||||
@@ -120,15 +120,6 @@ void slist_free_full(GSList * list, GDes
|
||||
}
|
||||
#endif
|
||||
|
||||
-void g_queue_free_full(GQueue * queue) {
|
||||
- while (!g_queue_is_empty(queue)) {
|
||||
- gpointer data;
|
||||
- data = g_queue_pop_head(queue);
|
||||
- amfree(data);
|
||||
- }
|
||||
- g_queue_free(queue);
|
||||
-}
|
||||
-
|
||||
void g_ptr_array_free_full(GPtrArray * array) {
|
||||
size_t i;
|
||||
|
15
amanda3-common/patches/patch-common-src_glib-util.h
Normal file
15
amanda3-common/patches/patch-common-src_glib-util.h
Normal file
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-common-src_glib-util.h,v 1.1 2012/07/12 05:22:41 schnoebe Exp $
|
||||
|
||||
Remove an unused function that conflicts with a glib 2.28+ routine
|
||||
(which has a different signature)
|
||||
|
||||
--- common-src/glib-util.h.orig 2012-02-21 11:36:51.000000000 +0000
|
||||
+++ common-src/glib-util.h
|
||||
@@ -72,7 +72,6 @@ void slist_free_full(GSList * list, GDes
|
||||
|
||||
/* These functions all take a GLib container, and call free() on all the
|
||||
* pointers in the container before free()ing the container itself. */
|
||||
-void g_queue_free_full(GQueue * queue);
|
||||
void g_ptr_array_free_full(GPtrArray * array);
|
||||
|
||||
/* g_value_compare() does what you expect. It returns TRUE if and
|
Loading…
Reference in a new issue