diff options
Diffstat (limited to 'core')
31 files changed, 62 insertions, 279 deletions
diff --git a/core/apparmor.html b/core/apparmor.html index e44acef..709f2a4 100644 --- a/core/apparmor.html +++ b/core/apparmor.html @@ -96,7 +96,7 @@ # <a href="index.html">Core OS Index</a> - <p>This is part of the c9 Manual. + <p>This is part of the Hive System Documentation. Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> diff --git a/core/bash.html b/core/bash.html index 353d7df..8e0c95e 100644 --- a/core/bash.html +++ b/core/bash.html @@ -124,8 +124,8 @@ <a href="index.html">Core OS Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/conf/pkgmk.conf b/core/conf/pkgmk.conf index 94bc9df..e72a433 100644 --- a/core/conf/pkgmk.conf +++ b/core/conf/pkgmk.conf @@ -22,7 +22,7 @@ case ${PKGMK_ARCH} in ;; esac -#PKGMK_SOURCE_MIRRORS=(http://c9.root.sx/ports/distfiles/) +#PKGMK_SOURCE_MIRRORS=(http://hive.gnu.systems/ports/distfiles/) # PKGMK_SOURCE_DIR="$PWD" PKGMK_SOURCE_DIR="/usr/ports/distfiles" # PKGMK_PACKAGE_DIR="$PWD" diff --git a/core/conf/pkgmk.conf.harden b/core/conf/pkgmk.conf.harden index ad95d65..f72dc53 100644 --- a/core/conf/pkgmk.conf.harden +++ b/core/conf/pkgmk.conf.harden @@ -78,7 +78,7 @@ esac #PKGMK_SOURCE_MIRRORS=(https://crux.nu/distfiles/) #PKGMK_SOURCE_MIRRORS=(https://crux.ster.zone/distfiles/) -PKGMK_SOURCE_MIRRORS=(https://c9.root.sx/ports/distfiles/) +PKGMK_SOURCE_MIRRORS=(https://hive.gnu.systems/ports/distfiles/) PKGMK_SOURCE_DIR="/srv/ports/distfiles" PKGMK_PACKAGE_DIR="/srv/ports/packages" PKGMK_WORK_DIR="/srv/ports/work/$name" diff --git a/core/conf/ports/c9-ports.git b/core/conf/ports/c9-ports.git deleted file mode 100644 index 392f77f..0000000 --- a/core/conf/ports/c9-ports.git +++ /dev/null @@ -1,7 +0,0 @@ -# Collection core -# -NAME=c9-ports -URL=git://c9.root.sx/c9-ports.git -BRANCH=develop -destination=/usr/ports/c9-ports -PORTS_DIR="/usr/ports" diff --git a/core/conf/ports/c9-ports.httpup b/core/conf/ports/c9-ports.httpup deleted file mode 100644 index 3a275e5..0000000 --- a/core/conf/ports/c9-ports.httpup +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/ports/c9-ports.httpup: c9-ports port collection -# - -ROOT_DIR=/usr/ports/c9-ports -URL=https://github.com/s1lvino/c9-ports/raw/master/ -# End of file diff --git a/core/conf/ports/contrib.git b/core/conf/ports/contrib.git index d9c0a7d..2516a71 100644 --- a/core/conf/ports/contrib.git +++ b/core/conf/ports/contrib.git @@ -1,7 +1,7 @@ # Collection core # NAME=contrib -URL=git://c9.root.sx/c9-contrib.git -BRANCH=develop +URL=git://c2.ank/contrib.git +BRANCH=develop-c34 destination=/usr/ports/contrib PORTS_DIR="/usr/ports" diff --git a/core/conf/ports/core.git b/core/conf/ports/core.git index 3e23528..50ac623 100644 --- a/core/conf/ports/core.git +++ b/core/conf/ports/core.git @@ -1,7 +1,7 @@ # Collection core # NAME=core -URL=git://c9.root.sx/c9-core.git -BRANCH=develop +URL=git://c2.ank/core.git +BRANCH=develop-c34 destination=/usr/ports/core PORTS_DIR="/usr/ports" diff --git a/core/conf/ports/drivers/git b/core/conf/ports/drivers/git deleted file mode 100755 index 654a8c7..0000000 --- a/core/conf/ports/drivers/git +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# /etc/ports/drivers/git: git driver script for ports(8) -# - -if [ $# -ne 1 ]; then - echo "usage: $0 <file>" >&2 - exit 1 -fi - -. $1 - -if [ -z "$URL" ]; then - echo "URL not set in '$1'" >&2 - exit 2 -fi -if [ -z "$NAME" ]; then - echo "NAME not set in '$1'" >&2 - exit 2 -fi -if [ -z "$BRANCH" ]; then - echo "BRANCH not set in '$1'" >&2 - exit 2 -fi - -REPOSITORY="$PORTS_DIR/$NAME" -if [ -n "$LOCAL_REPOSITORY" ]; then - REPOSITORY="$LOCAL_REPOSITORY" -fi - -echo "Fetching updates from $URL" -echo "Updating collection $NAME" - -cd "$REPOSITORY" 2> "/dev/null" - -if [ $? -lt 1 ]; then - git checkout -q "$BRANCH" - git fetch -q - git diff --pretty=format: --name-status "$BRANCH" origin/"$BRANCH" | sed "s/M\t/ Edit /g; s/A\t/ Checkout /g; s/D\t/ Delete /g" | sort - git clean -q -f - git reset -q --hard origin/"$BRANCH" -else - git clone -q -b "$BRANCH" "$URL" "$REPOSITORY" - ls -1 $REPOSITORY | sed "s/^/ Checkout /" -fi - -echo "Finished successfully" diff --git a/core/conf/ports/drivers/httpup b/core/conf/ports/drivers/httpup deleted file mode 100755 index 5c8db84..0000000 --- a/core/conf/ports/drivers/httpup +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# /etc/ports/drivers/httpup: httpup driver script for ports(8) -# - -if [ $# -ne 1 ]; then - echo "usage: $0 <file>" >&2 - exit 1 -fi - -. $1 - -if [ -z "$ROOT_DIR" ]; then - echo "ROOT_DIR not set in '$1'" >&2 - exit 2 -fi -if [ -z "$URL" ]; then - echo "URL not set in '$1'" >&2 - exit 2 -fi - -for REPO in $URL; do - PORT=`echo $REPO | sed -n '/#.*$/s|^.*#||p'` - httpup sync $REPO $ROOT_DIR/$PORT -done - -# End of file. diff --git a/core/conf/ports/drivers/rsync b/core/conf/ports/drivers/rsync deleted file mode 100755 index 14dd3e5..0000000 --- a/core/conf/ports/drivers/rsync +++ /dev/null @@ -1,143 +0,0 @@ -#!/usr/bin/perl -# -# /etc/ports/drivers/rsync: rsync(1) driver script for ports(8) -# - -use warnings; -use strict; -use File::Basename; - -my $host = ''; -my $collection = ''; -my $destination = ''; -my %new_checkouts; -my %old_checkouts; - -sub error -{ - my $message = shift; - print "Error: $message ($!)\nUpdating failed\n"; - exit 1; -} - -sub warning -{ - my $message = shift; - print "Warning: $message ($!)\n"; -} - -if ($#ARGV < 0) -{ - print "Usage: $0 <file>\n"; - exit 1; -} - -open(FILE, $ARGV[0]) or error("Couldn't open $ARGV[0]"); -while (<FILE>) -{ - chomp; - if (/^host=(.*)/) { $host = $1; } - elsif (/^collection=(.*)/) { $collection = $1; } - elsif (/^destination=(.*)/) { $destination = $1; } -} -close(FILE); - -if ($host eq '') { error("Host field not set in $ARGV[0]"); } -if ($collection eq '') { error("Collection field not set in $ARGV[0]"); } -if ($destination eq '') { error("Destination field not set in $ARGV[0]"); } - -if (-e "$destination/.checkouts") -{ - # read the old .checkouts file into memory - open(FILE, "$destination/.checkouts") or error("Couldn't read checkouts from $destination/.checkouts"); - while (<FILE>) - { - chomp; - $old_checkouts{$_} = 1; - } - close(FILE); -} - -print "Updating file list from " . $host . "::$collection\n"; - -# get the remote file list (new .checkouts) -open(PIPE, 'rsync -crz --no-human-readable ' . $host . '::' . $collection . '|') or error("Couldn't open pipe to rsync"); -while (<PIPE>) -{ - chomp; - - next if /^MOTD:/; # ignore MOTD lines - s/^(.{43})//; # ignore the first 43 characters (mode, date etc...) - next if /^.$/; # ignore the . directory - - $new_checkouts{$_} = 1; -} -close(PIPE); -error("Running rsync failed") unless $? == 0; - -print "Updating collection " . basename($destination) . "\n"; - -# now really run rsync -open(PIPE, 'rsync -crz --no-human-readable --log-format "%o %n" ' . $host . "::$collection $destination|") or error("Couldn't open pipe to rsync"); -while (<PIPE>) -{ - chomp; - - if (/^recv (.*)/) - { - if ($old_checkouts{$1}) - { - s/^recv/ Edit/; - } - else - { - s/^recv/ Checkout/; - } - } - - print $_ . "\n"; -} -close(PIPE); -error("Running rsync failed") unless $? == 0; - -# save new checkouts into .checkouts -open(FILE, ">$destination/.checkouts") or error("Couldn't save checkouts to $destination/.checkouts"); -foreach my $checkout (sort keys %new_checkouts) -{ - print FILE "$checkout\n"; -} -close(FILE); - -# use chroot as an additional safety measure when removing files -chroot($destination) or error("Couldn't chroot into $destination"); -chdir('/'); - -# iterate through old checkouts, remove obsolete files -foreach my $checkout (sort keys %old_checkouts) -{ - if (!$new_checkouts{$checkout}) - { - if (-f $checkout) - { - print " Delete $checkout\n"; - unlink($checkout) or warning("Couldn't delete $checkout"); - } - } -} - -# iterate through old checkouts, remove obsolete directories -foreach my $checkout (sort keys %old_checkouts) -{ - if (!$new_checkouts{$checkout}) - { - if (-d $checkout) - { - print " Delete $checkout\n"; - rmdir($checkout) or warning("Couldn't delete $checkout"); - } - } -} - -print "Finished successfully\n"; - -# End of file diff --git a/core/conf/ports/mate.httpup b/core/conf/ports/mate.httpup new file mode 100644 index 0000000..93ad84f --- /dev/null +++ b/core/conf/ports/mate.httpup @@ -0,0 +1,5 @@ +# Collection mate, by jaeger at crux dot ninja +# File generated by the CRUX portdb https://crux.nu/portdb/ + +ROOT_DIR=/usr/ports/mate +URL=https://raw.githubusercontent.com/mhoush/crux-mate/master/ diff --git a/core/conf/ports/opt.git b/core/conf/ports/opt.git index bedc00c..77ba4cd 100644 --- a/core/conf/ports/opt.git +++ b/core/conf/ports/opt.git @@ -1,6 +1,7 @@ # Collection core # NAME=opt -URL=git://c9.root.sx/c9-opt.git -BRANCH=develop +URL=git://c2.ank/opt.git +BRANCH=develop-c34 destination=/usr/ports/opt +PORTS_DIR="/usr/ports" diff --git a/core/conf/ports/ports.git b/core/conf/ports/ports.git new file mode 100644 index 0000000..23d9586 --- /dev/null +++ b/core/conf/ports/ports.git @@ -0,0 +1,7 @@ +# Collection Ports Driver +# +NAME=ports +URL=git://c2.ank/ports.git +BRANCH=develop +destination=/usr/ports/ports +PORTS_DIR="/usr/ports" diff --git a/core/conf/ports/xorg.git b/core/conf/ports/xorg.git index 5123db5..70ce45b 100644 --- a/core/conf/ports/xorg.git +++ b/core/conf/ports/xorg.git @@ -1,6 +1,7 @@ # Collection core # NAME=xorg -URL=git://c9.root.sx/c9-xorg.git -BRANCH=develop -destination=/usr/ports/xorg +URL=git://c2.ank/xorg.git +BRANCH=develop-c34 +destination=/srv/ports/xorg +PORTS_DIR="/usr/ports" diff --git a/core/configure.html b/core/configure.html index 008afbe..2fadfcf 100644 --- a/core/configure.html +++ b/core/configure.html @@ -52,7 +52,7 @@ </pre> <p>Edit /etc/hosts to contain your hostname and FQDN, - this example uses c9.core and c9.root.sx sub-domain from + this example uses c9.core and hive.gnu.systems sub-domain from <a href="http://freedns.afraid.org">afraid.org</a> pointing to 10.0.0.1 ip;</p> @@ -62,7 +62,7 @@ 127.0.0.1 c9.core c9 #<ip-address> <hostname.domain.org> <aliases> - 10.0.0.1 c9.root.sx + 10.0.0.1 hive.gnu.systems # IPv6 #::1 ip6-localhost ip6-loopback @@ -270,8 +270,8 @@ </pre> <a href="index.html">Core OS Index</a> - <p>This is part of the c9 Manual. - Copyright (C) 2017 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/dash.html b/core/dash.html index a926ce7..134616d 100644 --- a/core/dash.html +++ b/core/dash.html @@ -19,8 +19,8 @@ <a href="index.html">Core OS Index</a> - <p>This is part of the c9 Manual. - Copyright (C) 2017 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/exim.html b/core/exim.html index e922789..2f93af8 100644 --- a/core/exim.html +++ b/core/exim.html @@ -224,8 +224,8 @@ <a href="index.html">Core OS Index</a> <p> - This is part of the c9 Manual. - Copyright (C) 2017 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/hardening.html b/core/hardening.html index 383f583..60fea58 100644 --- a/core/hardening.html +++ b/core/hardening.html @@ -43,8 +43,8 @@ <p>Add unnecessary tests to profile to have less noise.</p> <a href="index.html">Core OS Index</a> - <p>This is part of the c9 Manual. - Copyright (C) 2017 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/index.html b/core/index.html index e6e6c62..f8b3663 100644 --- a/core/index.html +++ b/core/index.html @@ -153,8 +153,8 @@ <a href="../index.html">Documentation Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2017 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/install.html b/core/install.html index 12921bf..3f2334b 100644 --- a/core/install.html +++ b/core/install.html @@ -352,8 +352,8 @@ </pre> <a href="index.html">Core OS Index</a> - <p>This is part of the c9 Manual. - Copyright (C) 2017 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/linux.html b/core/linux.html index 1592fc4..0cfecd6 100644 --- a/core/linux.html +++ b/core/linux.html @@ -825,7 +825,7 @@ </pre> <a href="index.html">Core OS Index</a> - <p>This is part of the c9-doc Manual. + <p>This is part of the Hive System Documentation. Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> diff --git a/core/network.html b/core/network.html index 657cd31..feb9765 100644 --- a/core/network.html +++ b/core/network.html @@ -443,8 +443,8 @@ <a href="index.html">Core OS Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2017 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/package.html b/core/package.html index 21415ae..4aa649d 100644 --- a/core/package.html +++ b/core/package.html @@ -182,8 +182,8 @@ </pre> <a href="index.html">Core OS Index</a> - <p>This is part of the c9-doc Manual. - Copyright (C) 2017 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/ports.html b/core/ports.html index d724d76..7f1cd54 100644 --- a/core/ports.html +++ b/core/ports.html @@ -96,7 +96,7 @@ ;; esac - #PKGMK_SOURCE_MIRRORS=(http://c9.root.sx/ports/distfiles/) + #PKGMK_SOURCE_MIRRORS=(http://hive.gnu.systems/ports/distfiles/) # PKGMK_SOURCE_DIR="$PWD" PKGMK_SOURCE_DIR="/usr/ports/distfiles" # PKGMK_PACKAGE_DIR="$PWD" @@ -189,8 +189,8 @@ <a href="index.html">Core OS Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/reboot.html b/core/reboot.html index 1eb6808..1fae99b 100644 --- a/core/reboot.html +++ b/core/reboot.html @@ -223,8 +223,8 @@ </pre> <a href="index.html">Core OS Index</a> - <p>This is part of the c9-doc Manual. - Copyright (C) 2017 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/samhain.html b/core/samhain.html index 74f88fd..f161a16 100644 --- a/core/samhain.html +++ b/core/samhain.html @@ -255,8 +255,8 @@ <a href="index.html">Core OS Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2017 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/sysctl.html b/core/sysctl.html index ac1a74b..b871158 100644 --- a/core/sysctl.html +++ b/core/sysctl.html @@ -616,8 +616,8 @@ <a href="index.html">Core OS Index</a> - <p>This is part of the c9 Manual. - Copyright (C) 2017 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/tmux.html b/core/tmux.html index fe494b5..d6bc2c5 100644 --- a/core/tmux.html +++ b/core/tmux.html @@ -108,8 +108,8 @@ <a href="index.html">Core OS Index</a> <p> - This is part of the c9-doc Manual. - Copyright (C) 2016 + This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/toolchain.html b/core/toolchain.html index 04b58e3..0ed64bc 100644 --- a/core/toolchain.html +++ b/core/toolchain.html @@ -174,8 +174,8 @@ <a href="index.html">Core OS Index</a> - <p>This is part of the c9 Manual. - Copyright (C) 2017 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> diff --git a/core/tty-terminal.html b/core/tty-terminal.html index 1abf15e..2696119 100644 --- a/core/tty-terminal.html +++ b/core/tty-terminal.html @@ -72,8 +72,8 @@ <a href="index.html">Core OS Index</a> - <p>This is part of the c9 Manual. - Copyright (C) 2016 + <p>This is part of the Hive System Documentation. + Copyright (C) 2018 c9 team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> |