diff options
| author | Anderson Torres <anderson.torres.8519@gmail.com> | 2025-12-17 14:17:24 -0300 |
|---|---|---|
| committer | Rutherther <rutherther@ditigal.xyz> | 2026-01-25 21:25:28 +0100 |
| commit | d759f941acc0d8545c47cc72b51d382ac91e64e8 (patch) | |
| tree | 31264b253dc512926366a863c88dfccd4907ac01 /gnu/packages | |
| parent | 22a001c577a5c3a7796577dda3059723fedd5705 (diff) | |
gnu: Remove aegis.
* gnu/packages/patches/aegis-constness-error.patch,
* gnu/packages/patches/aegis-perl-tempdir1.patch,
* gnu/packages/patches/aegis-perl-tempdir2.patch,
* gnu/packages/patches/aegis-test-fixup-1.patch,
* gnu/packages/patches/aegis-test-fixup-2.patch: Remove files.
* gnu/local.mk: Remove references to the patches above.
* gnu/packages/version-control.scm (aegis): Delete variable.
Change-Id: If2c34fc9b93204b4b2aa248911d4d0e5002f8f8e
Signed-off-by: Andreas Enge <andreas@enge.fr>
Signed-off-by: Rutherther <rutherther@ditigal.xyz>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/patches/aegis-constness-error.patch | 12 | ||||
| -rw-r--r-- | gnu/packages/patches/aegis-perl-tempdir1.patch | 14 | ||||
| -rw-r--r-- | gnu/packages/patches/aegis-perl-tempdir2.patch | 18 | ||||
| -rw-r--r-- | gnu/packages/patches/aegis-test-fixup-1.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/patches/aegis-test-fixup-2.patch | 24 | ||||
| -rw-r--r-- | gnu/packages/version-control.scm | 96 |
6 files changed, 0 insertions, 179 deletions
diff --git a/gnu/packages/patches/aegis-constness-error.patch b/gnu/packages/patches/aegis-constness-error.patch deleted file mode 100644 index 2a6c9d2c376..00000000000 --- a/gnu/packages/patches/aegis-constness-error.patch +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | Fixes a fatal constness error with g++ 4.8.2. | ||
| 2 | --- aegis-4.24/common/ac/string/memmem.cc 2008-03-14 07:19:27.000000000 +0100 | ||
| 3 | +++ aegis-4.24/common/ac/string/memmem.cc 2014-01-26 11:17:58.000000000 +0100 | ||
| 4 | @@ -182,7 +182,7 @@ | ||
| 5 | |||
| 6 | // Use optimizations in memchr when possible. | ||
| 7 | if (needle_len == 1) | ||
| 8 | - return memchr(haystack, *needle, haystack_len); | ||
| 9 | + return (void *) memchr(haystack, *needle, haystack_len); | ||
| 10 | |||
| 11 | // Minimizing the worst-case complexity: | ||
| 12 | // Let n = haystack_len, m = needle_len. | ||
diff --git a/gnu/packages/patches/aegis-perl-tempdir1.patch b/gnu/packages/patches/aegis-perl-tempdir1.patch deleted file mode 100644 index 9068b98a772..00000000000 --- a/gnu/packages/patches/aegis-perl-tempdir1.patch +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | This patch removes the hard coded temporary directory (which might not exist on the system) | ||
| 2 | and replaces it using the Perl preferred method. | ||
| 3 | --- aegis-4.24/script/aebisect.in 2008-03-14 07:19:27.000000000 +0100 | ||
| 4 | +++ aegis-4.24/script/aebisect.in 2014-01-26 11:03:31.000000000 +0100 | ||
| 5 | @@ -34,7 +34,8 @@ | ||
| 6 | # @configure_input@ | ||
| 7 | # | ||
| 8 | # Configure additions? | ||
| 9 | -my $TmpDir = "/var/tmp"; | ||
| 10 | +use File::Temp qw/ tempdir /; | ||
| 11 | +my $TmpDir = tempdir(); | ||
| 12 | my $ProgramName = "aebisect"; | ||
| 13 | |||
| 14 | require 5.004; | ||
diff --git a/gnu/packages/patches/aegis-perl-tempdir2.patch b/gnu/packages/patches/aegis-perl-tempdir2.patch deleted file mode 100644 index 244a196fe5d..00000000000 --- a/gnu/packages/patches/aegis-perl-tempdir2.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | --- aegis-4.24/script/aeintegratq.in 2008-03-14 07:19:27.000000000 +0100 | ||
| 2 | +++ aegis-4.24/script/aeintegratq.in 2014-01-26 16:08:22.000000000 +0100 | ||
| 3 | @@ -49,13 +49,14 @@ | ||
| 4 | # | ||
| 5 | # @configure_input@ | ||
| 6 | # | ||
| 7 | +use File::Temp qw/ tempdir /; | ||
| 8 | # Grab useful locations from configure | ||
| 9 | $BinDir = "@bindir@"; | ||
| 10 | # configure does not expand @comdir@ directly so use sharedstatedir | ||
| 11 | $ComDir = "@sharedstatedir@"; | ||
| 12 | |||
| 13 | # Configure additions? | ||
| 14 | -$TmpDir = "/var/tmp"; | ||
| 15 | +$TmpDir = tempdir(); | ||
| 16 | # base mail program that takes all info (to: subj: etc) on stdin | ||
| 17 | $SendMail = "/usr/lib/sendmail"; | ||
| 18 | # Define the preferred integration host | ||
diff --git a/gnu/packages/patches/aegis-test-fixup-1.patch b/gnu/packages/patches/aegis-test-fixup-1.patch deleted file mode 100644 index 1ed4dad5257..00000000000 --- a/gnu/packages/patches/aegis-test-fixup-1.patch +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | This test fails because it expects a MIME type "Content-Type: image/gif" | ||
| 2 | whereas that provided by libmagic is "Content-Type: image/gif; charset=binary" | ||
| 3 | Presumably the test was written against a different version. | ||
| 4 | --- aegis-4.24/test/02/t0228a-matt.sh 2008-03-14 07:19:27.000000000 +0100 | ||
| 5 | +++ aegis-4.24/test/02/t0228a-matt.sh 2014-01-27 09:43:44.000000000 +0100 | ||
| 6 | @@ -147,7 +147,8 @@ | ||
| 7 | SCRIPT_NAME=/cgi-bin/aeget \ | ||
| 8 | PATH_INFO=icon/rss.gif \ | ||
| 9 | QUERY_STRING= \ | ||
| 10 | -$bin/aeget > rss.served.gif 2>&1 | ||
| 11 | +$bin/aeget \ | ||
| 12 | +| sed -e 's%^Content-Type: image/gif; charset=binary%Content-Type: image/gif%' > rss.served.gif 2>&1 | ||
| 13 | if test $? -ne 0 ; then fail; fi | ||
| 14 | |||
| 15 | # Compare the expected and the actual received file. | ||
diff --git a/gnu/packages/patches/aegis-test-fixup-2.patch b/gnu/packages/patches/aegis-test-fixup-2.patch deleted file mode 100644 index 6ba8691ed3d..00000000000 --- a/gnu/packages/patches/aegis-test-fixup-2.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | This test was failing with subversion 1.7.8 because the svn repository structure | ||
| 2 | was not as the test expected. Presumably the test relies on different version. | ||
| 3 | --- aegis-4.24/test/02/t0222a-pmil.sh 2008-03-14 07:19:27.000000000 +0100 | ||
| 4 | +++ aegis-4.24/test/02/t0222a-pmil.sh 2014-01-27 19:48:30.000000000 +0100 | ||
| 5 | @@ -268,7 +268,8 @@ | ||
| 6 | -c 10 > log 2>&1 | ||
| 7 | if test $? -ne 0 ; then cat log; fail; fi | ||
| 8 | |||
| 9 | -test -f $work/svnroot/db/revs/2 || fail | ||
| 10 | +activity="check svn db 271" | ||
| 11 | +test -f $work/svnroot/db/revs/0/2 || test -f $work/svnroot/db/revs/2 || fail | ||
| 12 | |||
| 13 | # -------------------------------------------------------------------------- | ||
| 14 | |||
| 15 | @@ -364,7 +365,8 @@ | ||
| 16 | -c 3 > log 2>&1 | ||
| 17 | if test $? -ne 0 ; then cat log; fail; fi | ||
| 18 | |||
| 19 | -test -f $work/svnroot/db/revs/3 || fail | ||
| 20 | +activity="check svn db 368" | ||
| 21 | +test -f $work/svnroot/db/revs/0/3 || test -f $work/svnroot/db/revs/3 || fail | ||
| 22 | |||
| 23 | # | ||
| 24 | # Only definite negatives are possible. | ||
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e138e0fd95d..a6e2dec7679 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm | |||
| @@ -3314,102 +3314,6 @@ code control system SCCS. This allows old code still under that system to be | |||
| 3314 | accessed and migrated on modern systems.") | 3314 | accessed and migrated on modern systems.") |
| 3315 | (license license:gpl3+))) | 3315 | (license license:gpl3+))) |
| 3316 | 3316 | ||
| 3317 | ;; This package can unfortunately work only in -TEST mode, since Aegis | ||
| 3318 | ;; requires that it is installed setuid root. | ||
| 3319 | (define-public aegis | ||
| 3320 | (package | ||
| 3321 | (name "aegis") | ||
| 3322 | (version "4.24") | ||
| 3323 | (source (origin | ||
| 3324 | (method url-fetch) | ||
| 3325 | (uri (string-append "mirror://sourceforge/aegis/aegis/" version | ||
| 3326 | "/aegis-" version ".tar.gz")) | ||
| 3327 | (sha256 | ||
| 3328 | (base32 | ||
| 3329 | "18s86ssarfmc4l17gbpzybca29m5wa37cbaimdji8czlcry3mcjl")) | ||
| 3330 | (patches (search-patches "aegis-perl-tempdir1.patch" | ||
| 3331 | "aegis-perl-tempdir2.patch" | ||
| 3332 | "aegis-test-fixup-1.patch" | ||
| 3333 | "aegis-test-fixup-2.patch" | ||
| 3334 | "aegis-constness-error.patch")))) | ||
| 3335 | (build-system gnu-build-system) | ||
| 3336 | (inputs | ||
| 3337 | `(("e2fsprogs" ,e2fsprogs) | ||
| 3338 | ("curl" ,curl) | ||
| 3339 | ("file" ,file) | ||
| 3340 | ("libxml2" ,libxml2) | ||
| 3341 | ("zlib" ,zlib) | ||
| 3342 | ("gettext" ,gettext-minimal))) | ||
| 3343 | (native-inputs | ||
| 3344 | (list bison | ||
| 3345 | groff | ||
| 3346 | perl | ||
| 3347 | ;; Various tests require the following: | ||
| 3348 | cvs | ||
| 3349 | flex | ||
| 3350 | cook | ||
| 3351 | subversion | ||
| 3352 | rcs | ||
| 3353 | ed)) | ||
| 3354 | (arguments | ||
| 3355 | `(#:configure-flags (list "--with-no-aegis-configured" | ||
| 3356 | "--sharedstatedir=/var/com/aegis" | ||
| 3357 | ;; Uses the old 'throw()' specifier with 'new' | ||
| 3358 | ;; which changed in C++11. | ||
| 3359 | "CXXFLAGS=-std=c++03") | ||
| 3360 | #:parallel-build? #f ; There are some nasty racy rules in the Makefile. | ||
| 3361 | #:phases | ||
| 3362 | (modify-phases %standard-phases | ||
| 3363 | (add-before 'configure 'pre-conf | ||
| 3364 | (lambda _ | ||
| 3365 | (substitute* (append '("configure" | ||
| 3366 | "etc/check-tar-gz.sh" | ||
| 3367 | "etc/patches.sh" | ||
| 3368 | "etc/test.sh" | ||
| 3369 | "script/aexver.in" | ||
| 3370 | "script/aebisect.in" | ||
| 3371 | "script/aeintegratq.in" | ||
| 3372 | "script/tkaegis.in" | ||
| 3373 | "script/test_funcs.in" | ||
| 3374 | "web/eg_oss_templ.sh" | ||
| 3375 | "web/webiface.html" | ||
| 3376 | "libaegis/getpw_cache.cc") | ||
| 3377 | (find-files "test" "\\.sh")) | ||
| 3378 | (("/bin/sh") (which "sh"))) | ||
| 3379 | (setenv "SH" (which "sh")) | ||
| 3380 | #t)) | ||
| 3381 | (replace 'check | ||
| 3382 | (lambda _ | ||
| 3383 | (let ((home (string-append (getcwd) "/my-new-home"))) | ||
| 3384 | ;; Some tests need to write to $HOME. | ||
| 3385 | (mkdir home) | ||
| 3386 | (setenv "HOME" home) | ||
| 3387 | |||
| 3388 | ;; This test assumes that flex has been symlinked to "lex". | ||
| 3389 | (substitute* "test/00/t0011a.sh" | ||
| 3390 | (("type lex") "type flex")) | ||
| 3391 | |||
| 3392 | ;; XXX Disable tests that fail, for unknown reasons, ‘for now’. | ||
| 3393 | (for-each | ||
| 3394 | (lambda (test) (substitute* "Makefile" | ||
| 3395 | (((string-append "test/" test "\\.ES ")) ""))) | ||
| 3396 | (list "00/t0011a" | ||
| 3397 | "00/t0049a" | ||
| 3398 | "01/t0196a")) | ||
| 3399 | |||
| 3400 | ;; The author decided to call the check rule "sure". | ||
| 3401 | (invoke "make" "sure"))))))) | ||
| 3402 | (home-page "https://sourceforge.net/projects/aegis/") | ||
| 3403 | (synopsis "Project change supervisor") | ||
| 3404 | (description "Aegis is a project change supervisor, and performs some of | ||
| 3405 | the Software Configuration Management needed in a CASE environment. Aegis | ||
| 3406 | provides a framework within which a team of developers may work on many | ||
| 3407 | changes to a program independently, and Aegis coordinates integrating these | ||
| 3408 | changes back into the master source of the program, with as little disruption | ||
| 3409 | as possible. Resolution of contention for source files, a major headache for | ||
| 3410 | any project with more than one developer, is one of Aegis's major functions.") | ||
| 3411 | (license license:gpl3+))) | ||
| 3412 | |||
| 3413 | (define-public tig | 3317 | (define-public tig |
| 3414 | (package | 3318 | (package |
| 3415 | (name "tig") | 3319 | (name "tig") |
