Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/pax-utils:master commit in: /, tests/source/, man/fragment/
Date: Mon, 02 Mar 2015 09:49:48
Message-Id: 1425288727.10c47816af92c613d67bb717286f3f8397d96c43.vapier@gentoo
1 commit: 10c47816af92c613d67bb717286f3f8397d96c43
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 2 09:32:07 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 2 09:32:07 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/pax-utils.git;a=commit;h=10c47816
7
8 migrate to git
9
10 ---
11 .cvsignore | 43 ------------------------------
12 .gitignore | 2 --
13 Makefile | 35 +++++++-----------------
14 Makefile.am | 12 ---------
15 README | 6 ++---
16 dumpelf.c | 6 ++---
17 lddtree.py | 4 +--
18 lddtree.sh | 5 +---
19 macho.h | 1 -
20 make-tarball.sh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
21 man/fragment/version | 2 +-
22 paxelf.c | 1 -
23 paxelf.h | 1 -
24 paxinc.c | 1 -
25 paxinc.h | 6 +++--
26 paxmacho.c | 1 -
27 paxmacho.h | 1 -
28 porting.h | 1 -
29 pspax.c | 5 ++--
30 scanelf.c | 6 ++---
31 scanmacho.c | 6 ++---
32 tests/source/dotest | 4 +--
33 xfuncs.c | 1 -
34 xfuncs.h | 1 -
35 24 files changed, 104 insertions(+), 122 deletions(-)
36
37 diff --git a/.cvsignore b/.cvsignore
38 deleted file mode 100644
39 index a121e02..0000000
40 --- a/.cvsignore
41 +++ /dev/null
42 @@ -1,43 +0,0 @@
43 -*bz2
44 -*~
45 -*.[adio]
46 -*.l[ao]
47 -*.gdb
48 -*.pyc
49 -*.deps
50 -*.libs
51 -
52 -*.patch
53 -*.orig
54 -*.rej
55 -*.diff
56 -pax-utils-*
57 -contrib
58 -
59 -a.out*
60 -lib*.so*
61 -core
62 -.gdb_history
63 -.gdbinit
64 -
65 -aclocal.m4
66 -autom4te.cache
67 -build
68 -config.cache
69 -config.h
70 -config.h.in
71 -config.log
72 -config.status
73 -configure
74 -autotools
75 -libtool
76 -Makefile.in
77 -stamp-h1
78 -
79 -dumpelf
80 -pspax
81 -scanelf
82 -scanmacho
83 -
84 -.git
85 -*.x
86
87 diff --git a/.gitignore b/.gitignore
88 index 394adca..4e0d5fa 100644
89 --- a/.gitignore
90 +++ b/.gitignore
91 @@ -40,5 +40,3 @@ stamp-h1
92 /scanmacho
93
94 /man/*.1
95 -
96 -CVS
97
98 diff --git a/Makefile b/Makefile
99 index 2f9e60b..8048d58 100644
100 --- a/Makefile
101 +++ b/Makefile
102 @@ -1,6 +1,5 @@
103 # Copyright 2003-2006 Ned Ludd <solar@××××××.net>
104 # Distributed under the terms of the GNU General Public License v2
105 -# $Header: /var/cvsroot/gentoo-projects/pax-utils/Makefile,v 1.88 2015/02/28 22:49:13 vapier Exp $
106 ####################################################################
107
108 check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
109 @@ -48,7 +47,10 @@ endif
110
111 ifdef PV
112 override CPPFLAGS += -DVERSION=\"$(PV)\"
113 +else
114 +VCSID := $(shell git describe --tags HEAD)
115 endif
116 +override CPPFLAGS += -DVCSID='"$(VCSID)"'
117
118 ####################################################################
119 ELF_TARGETS = scanelf dumpelf $(shell echo | $(CC) -dM -E - | grep -q __svr4__ || echo pspax)
120 @@ -131,32 +133,13 @@ endif
121 PN = pax-utils
122 P = $(PN)-$(PV)
123 dist:
124 - @if [ "$(PV)" = "" ] ; then \
125 - echo "Please run 'make dist PV=<ver>'" ; \
126 - exit 1 ; \
127 - fi
128 + ./make-tarball.sh $(PV)
129 +distcheck: dist
130 rm -rf $(P)
131 - mkdir $(P)
132 - cp -a CVS $(P)/
133 - cd $(P) && cvs up
134 - echo "<releaseinfo>$(PV)</releaseinfo>" > $(P)/man/fragment/version
135 - $(MAKE) -C $(P)/man
136 - sed -i '/AC_INIT/s:git:$(PV):' $(P)/configure.ac
137 - $(MAKE) -C $(P) autotools
138 - tar cf - $(P) --exclude=CVS --exclude=.cvsignore | xz > $(P).tar.xz
139 - @printf "\n ..... Making sure clean cvs build works ..... \n\n"
140 - set -e; \
141 - unset CFLAGS; \
142 - for t in all check clean debug check clean; do \
143 - $(MAKE) -C $(P) $$t; \
144 - done; \
145 - cd $(P); \
146 - ./configure -C; \
147 - for t in all check; do \
148 - $(MAKE) $$t; \
149 - done
150 + tar xf $(P).tar.xz
151 + $(MAKE) -C $(P)
152 + $(MAKE) -C $(P) check
153 rm -rf $(P)
154 - du -b $(P).tar.xz
155
156 -include .depend
157
158 @@ -171,7 +154,7 @@ check test:
159 GEN_MARK_START = \# @@@ GEN START @@@ \#
160 GEN_MARK_END = \# @@@ GEN START @@@ \#
161 EXTRA_DIST = \
162 - $(shell find '(' -name CVS -prune ')' -o '(' -type f -print ')')
163 + $(shell find -type f)
164 MAKE_MULTI_LINES = $(patsubst %,\\\\\n\t%,$(sort $(1)))
165 # 2nd level of indirection here is so the $(find) doesn't pick up
166 # files in EXTRA_DIST that get cleaned up ...
167
168 diff --git a/Makefile.am b/Makefile.am
169 index bcb7462..9f51139 100644
170 --- a/Makefile.am
171 +++ b/Makefile.am
172 @@ -44,28 +44,16 @@ EXTRA_DIST = autotools/m4/gnulib-cache.m4
173 # @@@ GEN START @@@ #
174 dist_man_MANS +=
175 EXTRA_DIST += \
176 - tests/CVS/Entries \
177 - tests/CVS/Repository \
178 - tests/CVS/Root \
179 tests/Makefile \
180 - tests/lddtree/CVS/Entries \
181 - tests/lddtree/CVS/Repository \
182 - tests/lddtree/CVS/Root \
183 tests/lddtree/Makefile \
184 tests/lddtree/dotest.cmp \
185 tests/lddtree/dotest.py \
186 tests/lddtree/dotest.sfx \
187 tests/lddtree/dotest.sh \
188 tests/lib.sh \
189 - tests/scanelf/CVS/Entries \
190 - tests/scanelf/CVS/Repository \
191 - tests/scanelf/CVS/Root \
192 tests/scanelf/Makefile \
193 tests/scanelf/dotest \
194 tests/scanelf/scanelf.simple.good \
195 - tests/source/CVS/Entries \
196 - tests/source/CVS/Repository \
197 - tests/source/CVS/Root \
198 tests/source/Makefile \
199 tests/source/dotest \
200 tests/source/space
201
202 diff --git a/README b/README
203 index 52f7f86..462e5ad 100644
204 --- a/README
205 +++ b/README
206 @@ -1,6 +1,6 @@
207 HOMEPAGE: http://hardened.gentoo.org/pax-utils.xml
208 -CVS: cvs -d :pserver:anonymous@××××××××××××××.org:/var/cvsroot co gentoo-projects/pax-utils
209 -VIEWVCS: http://sources.gentoo.org/gentoo-projects/pax-utils/
210 +GIT: git clone git://git.overlays.gentoo.org/proj/pax-utils.git
211 +VIEWVCS: http://git.overlays.gentoo.org/gitweb/?p=proj/pax-utils.git
212
213 pax-utils is a small set of various PaX aware and related utilities for
214 ELF binaries. It was written for ELF Q/A on Gentoo systems but can be
215 @@ -23,7 +23,7 @@ see the homepage at http://pax.grsecurity.net/
216
217 (Gentoo)
218 http://www.gentoo.org/proj/en/hardened/pax-utils.xml
219 -http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/
220 +http://git.overlays.gentoo.org/gitweb/?p=proj/pax-utils.git
221 Maintainer: solar@g.o,vapier@g.o
222
223 (openSUSE)
224
225 diff --git a/dumpelf.c b/dumpelf.c
226 index d81dcf1..3035b24 100644
227 --- a/dumpelf.c
228 +++ b/dumpelf.c
229 @@ -1,13 +1,11 @@
230 /*
231 * Copyright 2005-2012 Gentoo Foundation
232 * Distributed under the terms of the GNU General Public License v2
233 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/dumpelf.c,v 1.33 2015/02/22 00:54:34 vapier Exp $
234 *
235 * Copyright 2005-2012 Ned Ludd - <solar@g.o>
236 * Copyright 2005-2012 Mike Frysinger - <vapier@g.o>
237 */
238
239 -static const char rcsid[] = "$Id: dumpelf.c,v 1.33 2015/02/22 00:54:34 vapier Exp $";
240 const char argv0[] = "dumpelf";
241
242 #include "paxinc.h"
243 @@ -355,9 +353,9 @@ static void parseargs(int argc, char *argv[])
244 switch (flag) {
245
246 case 'V': /* version info */
247 - printf("pax-utils-%s: %s\n%s\n"
248 + printf("pax-utils-%s: %s\n"
249 "%s written for Gentoo by <solar and vapier @ gentoo.org>\n",
250 - VERSION, __FILE__, rcsid, argv0);
251 + VERSION, VCSID, argv0);
252 exit(EXIT_SUCCESS);
253 break;
254 case 'h': usage(EXIT_SUCCESS); break;
255
256 diff --git a/lddtree.py b/lddtree.py
257 index 9a2d205..4d1b15e 100755
258 --- a/lddtree.py
259 +++ b/lddtree.py
260 @@ -4,7 +4,6 @@
261 # Copyright 2012-2014 The Chromium OS Authors
262 # Use of this source code is governed by a BSD-style license (BSD-3)
263 # pylint: disable=C0301
264 -# $Header: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v 1.56 2014/11/20 01:22:36 vapier Exp $
265
266 """Read the ELF dependency tree and show it
267
268 @@ -447,8 +446,7 @@ def _NormalizePath(option, _opt, value, parser):
269
270
271 def _ShowVersion(_option, _opt, _value, _parser):
272 - d = '$Id: lddtree.py,v 1.56 2014/11/20 01:22:36 vapier Exp $'.split()
273 - print('%s-%s %s %s' % (d[1].split('.')[0], d[2], d[3], d[4]))
274 + print('lddtree by Mike Frysinger <vapier@g.o>')
275 sys.exit(0)
276
277
278
279 diff --git a/lddtree.sh b/lddtree.sh
280 index 523c778..a37d499 100755
281 --- a/lddtree.sh
282 +++ b/lddtree.sh
283 @@ -2,7 +2,6 @@
284 # Copyright 2007-2013 Gentoo Foundation
285 # Copyright 2007-2013 Mike Frysinger <vapier@g.o>
286 # Distributed under the terms of the GNU General Public License v2
287 -# $Header: /var/cvsroot/gentoo-projects/pax-utils/lddtree.sh,v 1.22 2013/04/07 19:20:09 vapier Exp $
288
289 argv0=${0##*/}
290
291 @@ -29,9 +28,7 @@ usage() {
292 }
293
294 version() {
295 - local id='$Id: lddtree.sh,v 1.22 2013/04/07 19:20:09 vapier Exp $'
296 - id=${id##*,v }
297 - exec echo "lddtree-${id% * Exp*}"
298 + exec echo "lddtree by Mike Frysinger <vapier@g.o>"
299 }
300
301 error() {
302
303 diff --git a/macho.h b/macho.h
304 index a08933b..09caba1 100644
305 --- a/macho.h
306 +++ b/macho.h
307 @@ -1,7 +1,6 @@
308 /*
309 * Copyright 2008-2012 Gentoo Foundation
310 * Distributed under the terms of the GNU General Public License v2
311 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/macho.h,v 1.10 2013/12/16 20:30:38 grobian Exp $
312 */
313
314 #ifndef _MACHO_H
315
316 diff --git a/make-tarball.sh b/make-tarball.sh
317 new file mode 100755
318 index 0000000..83caa75
319 --- /dev/null
320 +++ b/make-tarball.sh
321 @@ -0,0 +1,75 @@
322 +#!/bin/bash
323 +
324 +set -e
325 +
326 +if ! . /etc/init.d/functions.sh 2>/dev/null ; then
327 + einfo() { printf ' * %b\n' "$*"; }
328 + eerror() { einfo "$@" 1>&2; }
329 +fi
330 +die() { eerror "$@"; exit 1; }
331 +
332 +v() { printf '\t%s\n' "$*"; "$@"; }
333 +
334 +: ${MAKE:=make}
335 +
336 +if [[ $# -ne 1 ]] ; then
337 + die "Usage: $0 <ver>"
338 +fi
339 +
340 +case $1 in
341 +snap) ver=$(date -u +%Y%m%d) ;;
342 +git) ver="HEAD" ;;
343 +*)
344 + ver="v$1"
345 + if ! git describe --tags "${ver}" >&/dev/null ; then
346 + die "Please create the tag first: git tag ${ver}"
347 + fi
348 + ;;
349 +esac
350 +p="pax-utils-${ver#v}"
351 +
352 +rm -rf "${p}"
353 +mkdir "${p}"
354 +
355 +einfo "Checking out clean git sources ..."
356 +git archive "${ver}" | tar xf - -C "${p}"
357 +cd "${p}"
358 +
359 +einfo "Building autotools ..."
360 +sed -i "/^AC_INIT/s:git:${ver}:" configure.ac
361 +sed -i "1iPV := ${ver}" Makefile
362 +LC_ALL=C ${MAKE} -s autotools >/dev/null
363 +rm -rf autom4te.cache
364 +
365 +einfo "Building docs ..."
366 +echo "<releaseinfo>${ver#v}</releaseinfo>" > man/fragment/version
367 +make -C man
368 +cd ..
369 +
370 +einfo "Generating tarball ..."
371 +tar cf - "${p}" | xz > "${p}".tar.xz
372 +rm -r "${p}"
373 +du -b "${p}".tar.*
374 +
375 +einfo "Checking tarball (simple) ..."
376 +tar xf "${p}".tar.*
377 +pushd "${p}" >/dev/null
378 +v ${MAKE} -s
379 +v ${MAKE} -s check
380 +popd >/dev/null
381 +rm -rf "${p}"
382 +
383 +einfo "Checking tarball (autotools) ..."
384 +tar xf "${p}".tar.*
385 +pushd "${p}" >/dev/null
386 +v ./configure -q
387 +v ${MAKE} -s
388 +v ${MAKE} -s check
389 +popd >/dev/null
390 +rm -rf "${p}"
391 +
392 +echo
393 +einfo "All ready for distribution!"
394 +du -b "${p}".tar.*
395 +
396 +exit 0
397
398 diff --git a/man/fragment/version b/man/fragment/version
399 index 6ea022b..69ba922 100644
400 --- a/man/fragment/version
401 +++ b/man/fragment/version
402 @@ -1 +1 @@
403 -<releaseinfo>cvs</releaseinfo>
404 +<releaseinfo>git</releaseinfo>
405
406 diff --git a/paxelf.c b/paxelf.c
407 index f3de4df..bcc0251 100644
408 --- a/paxelf.c
409 +++ b/paxelf.c
410 @@ -1,7 +1,6 @@
411 /*
412 * Copyright 2003-2012 Gentoo Foundation
413 * Distributed under the terms of the GNU General Public License v2
414 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.81 2014/06/18 03:16:52 vapier Exp $
415 *
416 * Copyright 2005-2012 Ned Ludd - <solar@g.o>
417 * Copyright 2005-2012 Mike Frysinger - <vapier@g.o>
418
419 diff --git a/paxelf.h b/paxelf.h
420 index 1c1d672..0610516 100644
421 --- a/paxelf.h
422 +++ b/paxelf.h
423 @@ -1,7 +1,6 @@
424 /*
425 * Copyright 2005-2012 Gentoo Foundation
426 * Distributed under the terms of the GNU General Public License v2
427 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.h,v 1.61 2015/02/28 22:57:40 vapier Exp $
428 *
429 * Copyright 2005-2012 Ned Ludd - <solar@g.o>
430 * Copyright 2005-2012 Mike Frysinger - <vapier@g.o>
431
432 diff --git a/paxinc.c b/paxinc.c
433 index ea41dfb..b9a196b 100644
434 --- a/paxinc.c
435 +++ b/paxinc.c
436 @@ -1,7 +1,6 @@
437 /*
438 * Copyright 2003-2012 Gentoo Foundation
439 * Distributed under the terms of the GNU General Public License v2
440 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxinc.c,v 1.16 2013/04/10 22:16:45 vapier Exp $
441 *
442 * Copyright 2005-2012 Ned Ludd - <solar@g.o>
443 * Copyright 2005-2012 Mike Frysinger - <vapier@g.o>
444
445 diff --git a/paxinc.h b/paxinc.h
446 index ea94dae..003877d 100644
447 --- a/paxinc.h
448 +++ b/paxinc.h
449 @@ -1,7 +1,6 @@
450 /*
451 * Copyright 2005-2012 Gentoo Foundation
452 * Distributed under the terms of the GNU General Public License v2
453 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxinc.h,v 1.17 2012/11/04 07:26:24 vapier Exp $
454 *
455 * Copyright 2005-2012 Ned Ludd - <solar@g.o>
456 * Copyright 2005-2012 Mike Frysinger - <vapier@g.o>
457 @@ -16,7 +15,10 @@
458 #include "xfuncs.h"
459
460 #ifndef VERSION
461 -# define VERSION "cvs"
462 +# define VERSION "git"
463 +#endif
464 +#ifndef VCSID
465 +# define VCSID "<unknown>"
466 #endif
467
468 /* ELF love */
469
470 diff --git a/paxmacho.c b/paxmacho.c
471 index bd9fcf3..985507d 100644
472 --- a/paxmacho.c
473 +++ b/paxmacho.c
474 @@ -1,7 +1,6 @@
475 /*
476 * Copyright 2003-2012 Gentoo Foundation
477 * Distributed under the terms of the GNU General Public License v2
478 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxmacho.c,v 1.21 2013/04/16 16:26:28 vapier Exp $
479 *
480 * Copyright 2005-2012 Ned Ludd - <solar@g.o>
481 * Copyright 2005-2012 Mike Frysinger - <vapier@g.o>
482
483 diff --git a/paxmacho.h b/paxmacho.h
484 index c142da3..41ab43a 100644
485 --- a/paxmacho.h
486 +++ b/paxmacho.h
487 @@ -1,7 +1,6 @@
488 /*
489 * Copyright 2005-2012 Gentoo Foundation
490 * Distributed under the terms of the GNU General Public License v2
491 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxmacho.h,v 1.8 2013/04/16 16:26:28 vapier Exp $
492 *
493 * Copyright 2005-2012 Ned Ludd - <solar@g.o>
494 * Copyright 2005-2012 Mike Frysinger - <vapier@g.o>
495
496 diff --git a/porting.h b/porting.h
497 index fcf5ced..32d4171 100644
498 --- a/porting.h
499 +++ b/porting.h
500 @@ -1,7 +1,6 @@
501 /*
502 * Copyright 2005-2012 Gentoo Foundation
503 * Distributed under the terms of the GNU General Public License v2
504 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/porting.h,v 1.46 2014/10/19 08:20:55 vapier Exp $
505 *
506 * Copyright 2005-2012 Ned Ludd - <solar@g.o>
507 * Copyright 2005-2012 Mike Frysinger - <vapier@g.o>
508
509 diff --git a/pspax.c b/pspax.c
510 index c98d44f..e27b7eb 100644
511 --- a/pspax.c
512 +++ b/pspax.c
513 @@ -12,7 +12,6 @@
514 * cc -o pspax pspax.c -DWANT_SYSCAP -lcap
515 */
516
517 -static const char rcsid[] = "$Id: pspax.c,v 1.53 2015/02/22 00:54:34 vapier Exp $";
518 const char argv0[] = "pspax";
519
520 #include "paxinc.h"
521 @@ -483,9 +482,9 @@ static void parseargs(int argc, char *argv[])
522 switch (flag) {
523
524 case 'V': /* version info */
525 - printf("pax-utils-%s: %s\n%s\n"
526 + printf("pax-utils-%s: %s\n"
527 "%s written for Gentoo by <solar and vapier @ gentoo.org>\n",
528 - VERSION, __FILE__, rcsid, argv0);
529 + VERSION, VCSID, argv0);
530 exit(EXIT_SUCCESS);
531 break;
532 case 'h': usage(EXIT_SUCCESS); break;
533
534 diff --git a/scanelf.c b/scanelf.c
535 index fae8640..4db4c35 100644
536 --- a/scanelf.c
537 +++ b/scanelf.c
538 @@ -1,13 +1,11 @@
539 /*
540 * Copyright 2003-2012 Gentoo Foundation
541 * Distributed under the terms of the GNU General Public License v2
542 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.277 2015/02/28 22:59:34 vapier Exp $
543 *
544 * Copyright 2003-2012 Ned Ludd - <solar@g.o>
545 * Copyright 2004-2012 Mike Frysinger - <vapier@g.o>
546 */
547
548 -static const char rcsid[] = "$Id: scanelf.c,v 1.277 2015/02/28 22:59:34 vapier Exp $";
549 const char argv0[] = "scanelf";
550
551 #include "paxinc.h"
552 @@ -2218,9 +2216,9 @@ static int parseargs(int argc, char *argv[])
553 switch (i) {
554
555 case 'V':
556 - printf("pax-utils-%s: %s\n%s\n"
557 + printf("pax-utils-%s: %s\n"
558 "%s written for Gentoo by <solar and vapier @ gentoo.org>\n",
559 - VERSION, __FILE__, rcsid, argv0);
560 + VERSION, VCSID, argv0);
561 exit(EXIT_SUCCESS);
562 break;
563 case 'h': usage(EXIT_SUCCESS); break;
564
565 diff --git a/scanmacho.c b/scanmacho.c
566 index 71e971c..a36aed4 100644
567 --- a/scanmacho.c
568 +++ b/scanmacho.c
569 @@ -1,7 +1,6 @@
570 /*
571 * Copyright 2008-2012 Gentoo Foundation
572 * Distributed under the terms of the GNU General Public License v2
573 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanmacho.c,v 1.25 2015/02/22 00:54:34 vapier Exp $
574 *
575 * based on scanelf by:
576 * Copyright 2003-2012 Ned Ludd - <solar@g.o>
577 @@ -10,7 +9,6 @@
578 * 2008-2013 Fabian Groffen - <grobian@g.o>
579 */
580
581 -static const char rcsid[] = "$Id: scanmacho.c,v 1.25 2015/02/22 00:54:34 vapier Exp $";
582 const char argv0[] = "scanmacho";
583
584 #include "paxinc.h"
585 @@ -630,9 +628,9 @@ static int parseargs(int argc, char *argv[])
586 switch (i) {
587
588 case 'V':
589 - printf("pax-utils-%s: %s\n%s\n"
590 + printf("pax-utils-%s: %s\n"
591 "%s written for Gentoo by <solar, vapier and grobian @ gentoo.org>\n",
592 - VERSION, __FILE__, rcsid, argv0);
593 + VERSION, VCSID, argv0);
594 exit(EXIT_SUCCESS);
595 break;
596 case 'h': usage(EXIT_SUCCESS); break;
597
598 diff --git a/tests/source/dotest b/tests/source/dotest
599 index b7b3567..16297e2 100755
600 --- a/tests/source/dotest
601 +++ b/tests/source/dotest
602 @@ -4,7 +4,7 @@
603
604 findfiles() {
605 find "${top_srcdir}" \
606 - '(' -type d -a '(' -name CVS -o -name .git -o -name autotools ')' -prune ')' \
607 + '(' -type d -a '(' -name .git -o -name autotools ')' -prune ')' \
608 -o '(' '(' -name '*.[ch]' -a ! -name 'config.h' ')' -print0 ')'
609 }
610
611 @@ -12,7 +12,7 @@ findfiles() {
612 # check for misc common typos
613 #
614 find "${top_srcdir}" \
615 - '(' -type d -a '(' -name CVS -o -name .git -o -name tests ')' -prune ')' \
616 + '(' -type d -a '(' -name .git -o -name tests ')' -prune ')' \
617 -o '(' -type f -a -print0 ')' | xargs -0 \
618 grep -n -I \
619 -e '\<compatability\>' \
620
621 diff --git a/xfuncs.c b/xfuncs.c
622 index 5389e17..cd73dfa 100644
623 --- a/xfuncs.c
624 +++ b/xfuncs.c
625 @@ -1,7 +1,6 @@
626 /*
627 * Copyright 2003-2012 Gentoo Foundation
628 * Distributed under the terms of the GNU General Public License v2
629 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.c,v 1.12 2014/03/20 07:52:07 vapier Exp $
630 *
631 * Copyright 2003-2012 Ned Ludd - <solar@g.o>
632 * Copyright 2004-2012 Mike Frysinger - <vapier@g.o>
633
634 diff --git a/xfuncs.h b/xfuncs.h
635 index 959d10d..82f5da0 100644
636 --- a/xfuncs.h
637 +++ b/xfuncs.h
638 @@ -1,7 +1,6 @@
639 /*
640 * Copyright 2003-2012 Gentoo Foundation
641 * Distributed under the terms of the GNU General Public License v2
642 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.h,v 1.8 2014/03/20 07:59:27 vapier Exp $
643 *
644 * Copyright 2003-2012 Ned Ludd - <solar@g.o>
645 * Copyright 2004-2012 Mike Frysinger - <vapier@g.o>