Sat Feb 13 06:28:21 2010 UTC ()
Update aegis to 4.24.2.

While here reset location of shardstatedir to default location.
${VARBASE}/run is bad idea, because persistent data are stored.
Noticed by Marko Schutz in pkgsrc-users@.

Notes:
   Version 4.24.2 (25-Jun-2009)
	* The branch fstate can	contain	fake transparent entries when a	change
	not yet	integrated modifies for	the first time in the branch a file.

	It is possible that such entries cause troubles	if the project is
	configured to write the	pfstate	file.  To avoid	such troubles the fake
	transparent entries are	stripped on the	fly when reading the pfstate
	file.

	The way	the the	pfstate	file is	written	is not modified.

	* The Italian translation of error messages is now available.

	* The Vietnamese and Dutch error messages has been updated.

	* The aerevml(1) command was incorrectly printing twice	user defined
	attributes. This behavior has been fixed.

	* The aeclean(1) command was incorrectly checking the patterns against
	the absolute name of the files.	 This behavior has been	fixed.

	* The aelock(1)	man page was incorrectly reporting the attribute name
	aelock use.  This has been fixed.

	* The aesub(5) man page	now reference aeuconf(5) in the	email address
	section.

	* The aedist(1)	command	is now more robust when	handling renamed
	files.

	* The t0228a-matt.sh test script has been made more robust with
	respect	to different behavior of libmagic.

	* The t0127a.sh	test script (aeimport vs. sccs)	has been fixed.

	* A number of memory related bugs has been fixed.

	* Some typo has	been corrected in the ae-repo-ci(1) man	page.

	* The build process has	been improved to give more informative
	messages when a	new aegis developer populate his repository for	the
	first time.


(obache)
diff -r1.20 -r1.21 pkgsrc/devel/aegis/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/aegis/PLIST
diff -r1.9 -r1.10 pkgsrc/devel/aegis/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/aegis/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/devel/aegis/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/devel/aegis/patches/patch-ad
cvs diff -r1.20 -r1.21 pkgsrc/devel/aegis/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/aegis/Makefile 2010/01/17 12:02:12 1.20
+++ pkgsrc/devel/aegis/Makefile 2010/02/13 06:28:21 1.21
@@ -1,60 +1,59 @@ @@ -1,60 +1,59 @@
1# $NetBSD: Makefile,v 1.20 2010/01/17 12:02:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2010/02/13 06:28:21 obache Exp $
2# 2#
3 3
4DISTNAME= aegis-4.24.1 4DISTNAME= aegis-4.24.2
5PKGREVISION= 1 
6CATEGORIES= devel scm 5CATEGORIES= devel scm
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aegis/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aegis/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://aegis.sourceforge.net/ 9HOMEPAGE= http://aegis.sourceforge.net/
11COMMENT= Aegis is a transaction base software configuration management system 10COMMENT= Aegis is a transaction base software configuration management system
12LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
16 15
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
20USE_TOOLS+= groff gsoelim msgfmt perl:run yacc patch:run 19USE_TOOLS+= groff gsoelim msgfmt perl:run yacc patch:run
21 20
22.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
23 22
24AEGIS_USER_UID?= 3 23AEGIS_USER_UID?= 3
25AEGIS_USER_GID?= 3 24AEGIS_USER_GID?= 3
26 25
27CONFIGURE_ARGS+= --with-nlsdir=${_PKGLOCALEDIR} 26CONFIGURE_ARGS+= --with-nlsdir=${_PKGLOCALEDIR}
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
29CONFIGURE_ARGS+= --with-no-aegis-configured 28CONFIGURE_ARGS+= --with-no-aegis-configured
30CONFIGURE_ARGS+= --sharedstatedir=${VARBASE}/run/aegis 29CONFIGURE_ARGS+= --sharedstatedir=${PREFIX}/com/aegis
31CONFIGURE_ENV+= PATCH=${PATCH:Q} 30CONFIGURE_ENV+= PATCH=${PATCH:Q}
32CONFIGURE_ENV+= AEGIS_UID=${AEGIS_USER_UID:Q} 31CONFIGURE_ENV+= AEGIS_UID=${AEGIS_USER_UID:Q}
33CONFIGURE_ENV+= AEGIS_GID=${AEGIS_USER_GID:Q} 32CONFIGURE_ENV+= AEGIS_GID=${AEGIS_USER_GID:Q}
34 33
35EGDIR= ${PREFIX}/share/examples/aegis 34EGDIR= ${PREFIX}/share/examples/aegis
36INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} 35INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
37 36
38CONF_FILES+= ${EGDIR}/profile.d/aegis.csh ${PKG_SYSCONFDIR}/profile.d/aegis.csh 37CONF_FILES+= ${EGDIR}/profile.d/aegis.csh ${PKG_SYSCONFDIR}/profile.d/aegis.csh
39CONF_FILES+= ${EGDIR}/profile.d/aegis.sh ${PKG_SYSCONFDIR}/profile.d/aegis.sh 38CONF_FILES+= ${EGDIR}/profile.d/aegis.sh ${PKG_SYSCONFDIR}/profile.d/aegis.sh
40 39
41SPECIAL_PERMS+= bin/aegis ${SETUID_ROOT_PERMS} 40SPECIAL_PERMS+= bin/aegis ${SETUID_ROOT_PERMS}
42SPECIAL_PERMS+= bin/aeimport ${SETUID_ROOT_PERMS} 41SPECIAL_PERMS+= bin/aeimport ${SETUID_ROOT_PERMS}
43SPECIAL_PERMS+= bin/aelock ${SETUID_ROOT_PERMS} 42SPECIAL_PERMS+= bin/aelock ${SETUID_ROOT_PERMS}
44 43
45OWN_DIRS_PERMS+= ${VARBASE}/run/aegis ${AEGIS_USER_UID} ${AEGIS_USER_GID} 2755 44OWN_DIRS_PERMS+= com/aegis ${AEGIS_USER_UID} ${AEGIS_USER_GID} 2755
46MAKE_DIRS+= ${PKG_SYSCONFDIR}/profile.d 45MAKE_DIRS+= ${PKG_SYSCONFDIR}/profile.d
47 46
48BUILD_DEFS+= VARBASE AEGIS_USER_UID AEGIS_USER_GID 47BUILD_DEFS+= AEGIS_USER_UID AEGIS_USER_GID
49 48
50TEST_TARGET= sure 49TEST_TARGET= sure
51 50
52AUTO_MKDIRS= yes 51AUTO_MKDIRS= yes
53 52
54.include "../../archivers/bzip2/buildlink3.mk" 53.include "../../archivers/bzip2/buildlink3.mk"
55.include "../../devel/gettext-lib/buildlink3.mk" 54.include "../../devel/gettext-lib/buildlink3.mk"
56.include "../../devel/zlib/buildlink3.mk" 55.include "../../devel/zlib/buildlink3.mk"
57.include "../../sysutils/file/buildlink3.mk" 56.include "../../sysutils/file/buildlink3.mk"
58.include "../../textproc/libxml2/buildlink3.mk" 57.include "../../textproc/libxml2/buildlink3.mk"
59.include "../../www/curl/buildlink3.mk" 58.include "../../www/curl/buildlink3.mk"
60.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/devel/aegis/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/aegis/PLIST 2009/06/14 17:48:32 1.6
+++ pkgsrc/devel/aegis/PLIST 2010/02/13 06:28:21 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:48:32 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.7 2010/02/13 06:28:21 obache Exp $
2bin/ae-cvs-ci 2bin/ae-cvs-ci
3bin/ae-repo-ci 3bin/ae-repo-ci
4bin/ae-sccs-put 4bin/ae-sccs-put
5bin/ae_diff2htm 5bin/ae_diff2htm
6bin/aeannotate 6bin/aeannotate
7bin/aebisect 7bin/aebisect
8bin/aebuffy 8bin/aebuffy
9bin/aecomp 9bin/aecomp
10bin/aecomplete 10bin/aecomplete
11bin/aecvsserver 11bin/aecvsserver
12bin/aede-policy 12bin/aede-policy
13bin/aediff 13bin/aediff
14bin/aedist 14bin/aedist
@@ -425,18 +425,19 @@ share/aegis/wish/aecomp.rpt @@ -425,18 +425,19 @@ share/aegis/wish/aecomp.rpt
425share/aegis/wish/chan_attr.rpt 425share/aegis/wish/chan_attr.rpt
426share/aegis/wish/chan_list.rpt 426share/aegis/wish/chan_list.rpt
427share/aegis/wish/devs_list.rpt 427share/aegis/wish/devs_list.rpt
428share/aegis/wish/proj_attr.rpt 428share/aegis/wish/proj_attr.rpt
429share/aegis/wish/proj_conf.rpt 429share/aegis/wish/proj_conf.rpt
430share/aegis/wish/proj_list.rpt 430share/aegis/wish/proj_list.rpt
431share/aegis/wish/tkaer_info.rpt 431share/aegis/wish/tkaer_info.rpt
432share/examples/aegis/profile.d/aegis.csh 432share/examples/aegis/profile.d/aegis.csh
433share/examples/aegis/profile.d/aegis.sh 433share/examples/aegis/profile.d/aegis.sh
434share/locale/de/LC_MESSAGES/aegis.mo 434share/locale/de/LC_MESSAGES/aegis.mo
435share/locale/en/LC_MESSAGES/aegis.mo 435share/locale/en/LC_MESSAGES/aegis.mo
436share/locale/es/LC_MESSAGES/aegis.mo 436share/locale/es/LC_MESSAGES/aegis.mo
437share/locale/fr/LC_MESSAGES/aegis.mo 437share/locale/fr/LC_MESSAGES/aegis.mo
 438share/locale/it/LC_MESSAGES/aegis.mo
438share/locale/nl/LC_MESSAGES/aegis.mo 439share/locale/nl/LC_MESSAGES/aegis.mo
439share/locale/pt_BR/LC_MESSAGES/aegis.mo 440share/locale/pt_BR/LC_MESSAGES/aegis.mo
440share/locale/ro/LC_MESSAGES/aegis.mo 441share/locale/ro/LC_MESSAGES/aegis.mo
441share/locale/ru/LC_MESSAGES/aegis.mo 442share/locale/ru/LC_MESSAGES/aegis.mo
442share/locale/vi/LC_MESSAGES/aegis.mo 443share/locale/vi/LC_MESSAGES/aegis.mo
cvs diff -r1.9 -r1.10 pkgsrc/devel/aegis/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/aegis/distinfo 2009/11/29 21:55:09 1.9
+++ pkgsrc/devel/aegis/distinfo 2010/02/13 06:28:21 1.10
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.9 2009/11/29 21:55:09 dholland Exp $ 1$NetBSD: distinfo,v 1.10 2010/02/13 06:28:21 obache Exp $
2 2
3SHA1 (aegis-4.24.1.tar.gz) = 825d1fc24c1d9c1250bc297abf5162b1c56cbc63 3SHA1 (aegis-4.24.2.tar.gz) = 3051a4272cfb3d1dcadec0234a5cd06a3d96e36b
4RMD160 (aegis-4.24.1.tar.gz) = b8d5e37c0870c21d123ab5b5ec01a84f33f2b424 4RMD160 (aegis-4.24.2.tar.gz) = 3bbf6d29295d04313ab8e2a7cb2d80464c338c6b
5Size (aegis-4.24.1.tar.gz) = 4087917 bytes 5Size (aegis-4.24.2.tar.gz) = 4180025 bytes
6SHA1 (patch-aa) = 6b85eb9011379e6bed80635744509a2537f5457b 6SHA1 (patch-aa) = 90ca2d4c6e42588b52133a8772cb658608fe43b2
7SHA1 (patch-ab) = c29c15aff7037f18a2e1cc0847d5ed2adbea38cc 7SHA1 (patch-ab) = 58a3ff17477ac4568d78735bd43449f8000645e1
8SHA1 (patch-ad) = fedf733f29e02382887b1e2dbd004404da513787 8SHA1 (patch-ad) = 3385dc23da50afc6827664c8d481ba89ba3fd435
cvs diff -r1.4 -r1.5 pkgsrc/devel/aegis/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/aegis/patches/patch-aa 2009/06/10 11:16:36 1.4
+++ pkgsrc/devel/aegis/patches/patch-aa 2010/02/13 06:28:21 1.5
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-aa,v 1.4 2009/06/10 11:16:36 obache Exp $ 1$NetBSD: patch-aa,v 1.5 2010/02/13 06:28:21 obache Exp $
2 2
3--- Makefile.in.orig 2008-09-24 21:48:58.000000000 +0000 3--- Makefile.in.orig 2009-06-25 16:00:55.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -10248,7 +10248,7 @@ $(DESTDIR)$(datadir)/cshrc: lib/cshrc li 5@@ -10248,7 +10248,7 @@ $(DESTDIR)$(datadir)/cshrc: lib/cshrc li
6  6
7 $(DESTDIR)$(sysconfdir)/profile.d/aegis.csh: $(DESTDIR)$(datadir)/cshrc 7 $(DESTDIR)$(sysconfdir)/profile.d/aegis.csh: $(DESTDIR)$(datadir)/cshrc
8 -@mkdir -p $(DESTDIR)$(sysconfdir)/profile.d 8 -@mkdir -p $(DESTDIR)$(sysconfdir)/profile.d
9- -ln -s $(datadir)/cshrc $@ 9- -ln -s $(datadir)/cshrc $@
10+ -ln -s $(DESTDIR)$(datadir)/cshrc $@ 10+ -ln -s $(DESTDIR)$(datadir)/cshrc $@
11  11
12 $(DESTDIR)$(datadir)/db_forced.sh: lib/db_forced.sh lib/.mkdir.datadir 12 $(DESTDIR)$(datadir)/db_forced.sh: lib/db_forced.sh lib/.mkdir.datadir
13 $(INSTALL_SCRIPT) lib/db_forced.sh $@ 13 $(INSTALL_SCRIPT) lib/db_forced.sh $@
14@@ -14292,7 +14292,7 @@ $(DESTDIR)$(datadir)/profile: lib/profil 14@@ -14300,7 +14300,7 @@ $(DESTDIR)$(datadir)/profile: lib/profil
15  15
16 $(DESTDIR)$(sysconfdir)/profile.d/aegis.sh: $(DESTDIR)$(datadir)/profile 16 $(DESTDIR)$(sysconfdir)/profile.d/aegis.sh: $(DESTDIR)$(datadir)/profile
17 -@mkdir -p $(DESTDIR)$(sysconfdir)/profile.d 17 -@mkdir -p $(DESTDIR)$(sysconfdir)/profile.d
18- -ln -s $(datadir)/profile $@ 18- -ln -s $(datadir)/profile $@
19+ -ln -s $(DESTDIR)$(datadir)/profile $@ 19+ -ln -s $(DESTDIR)$(datadir)/profile $@
20  20
21 lib/pt_BR/LC_MESSAGES/aegis.mo: etc/msgfmt.sh \ 21 lib/pt_BR/LC_MESSAGES/aegis.mo: etc/msgfmt.sh \
22 lib/pt_BR/LC_MESSAGES/aegis.po 22 lib/pt_BR/LC_MESSAGES/aegis.po
cvs diff -r1.3 -r1.4 pkgsrc/devel/aegis/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/aegis/patches/patch-ab 2009/11/29 21:55:09 1.3
+++ pkgsrc/devel/aegis/patches/patch-ab 2010/02/13 06:28:21 1.4
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ab,v 1.3 2009/11/29 21:55:09 dholland Exp $ 1$NetBSD: patch-ab,v 1.4 2010/02/13 06:28:21 obache Exp $
2 2
3Avoid compiler noise when storing an integer in a pointer. 3Avoid compiler noise when storing an integer in a pointer.
4 4
5(This code will break on 32-bit platforms after 2038, but that's 5(This code will break on 32-bit platforms after 2038, but that's
6somebody else's problem.) 6somebody else's problem.)
7 7
8--- libaegis/project/history/change/change2time.cc~ 2008-09-24 17:48:58.000000000 -0400 8--- libaegis/project/history/change/change2time.cc.orig 2009-06-25 16:00:55.000000000 +0000
9+++ libaegis/project/history/change/change2time.cc 2009-11-29 15:30:43.000000000 -0500 9+++ libaegis/project/history/change/change2time.cc
10@@ -28,13 +28,13 @@ time_t 10@@ -28,13 +28,13 @@ time_t
11 project_ty::change_completion_timestamp(long change_number) 11 project_ty::change_completion_timestamp(long change_number)
12 { 12 {
13 assert(change2time_stp); 13 assert(change2time_stp);
14- time_t result = (time_t)itab_query(change2time_stp, change_number); 14- time_t result = (time_t)itab_query(change2time_stp, change_number);
15+ time_t result = (time_t)(intptr_t)itab_query(change2time_stp, change_number); 15+ time_t result = (time_t)(intptr_t)itab_query(change2time_stp, change_number);
16 if (!result) 16 if (!result)
17 { 17 {
18 change::pointer cp = change_alloc(this, change_number); 18 change::pointer cp = change_alloc(this, change_number);
19 change_bind_existing(cp); 19 change_bind_existing(cp);
20 result = ::change_completion_timestamp(cp); 20 result = ::change_completion_timestamp(cp);
21- itab_assign (change2time_stp, cp->number, (void*)result); 21- itab_assign (change2time_stp, cp->number, (void*)result);
22+ itab_assign (change2time_stp, cp->number, (void*)(intptr_t)result); 22+ itab_assign (change2time_stp, cp->number, (void*)(intptr_t)result);
cvs diff -r1.1 -r1.2 pkgsrc/devel/aegis/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/aegis/patches/patch-ad 2009/06/10 11:16:36 1.1
+++ pkgsrc/devel/aegis/patches/patch-ad 2010/02/13 06:28:21 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-ad,v 1.1 2009/06/10 11:16:36 obache Exp $ 1$NetBSD: patch-ad,v 1.2 2010/02/13 06:28:21 obache Exp $
2 2
3--- common/safe_strsig.cc.orig 2008-09-24 21:48:58.000000000 +0000 3--- common/safe_strsig.cc.orig 2009-06-25 16:00:55.000000000 +0000
4+++ common/safe_strsig.cc 4+++ common/safe_strsig.cc
5@@ -18,6 +18,7 @@ 5@@ -19,6 +19,7 @@
6  
7 #include <common/ac/stdio.h> 6 #include <common/ac/stdio.h>
 7 #include <common/ac/stdlib.h>
8 #include <common/ac/string.h> 8 #include <common/ac/string.h>
9+#include <common/ac/unistd.h> 9+#include <common/ac/unistd.h>
10  10
11 #include <common/safe_strsig.h> 11 #include <common/safe_strsig.h>
12  12