summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2015-04-28 08:27:29 +0200
committerYorhel <git@yorhel.nl>2015-04-28 08:27:29 +0200
commit2da67d585ccdce8820ca5730811bb9d7efe3b8e5 (patch)
treee86df812cb9968f01c79cf8682cc9ff2ca78fc10
parenta2f3692f3cbafce974acefb1c6e31a233c7e3392 (diff)
Various changes/fixes, 3 new distro versions
-rw-r--r--Makefile2
-rw-r--r--lib/ManUtils/ManUtils.pm3
-rw-r--r--schema.sql5
-rwxr-xr-xutil/arch.sh2
-rw-r--r--util/common.sh1
-rwxr-xr-xutil/cron.sh2
-rwxr-xr-xutil/deb.sh26
-rwxr-xr-xutil/freebsd.sh10
-rwxr-xr-xwww/index.pl24
9 files changed, 58 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 25e4714..b1169e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.PHONY: ManUtils
ManUtils: lib/ManUtils/Build
- cd lib/ManUtils && ./Build install --install-base=inst
+ cd lib/ManUtils && perl Build.PL && ./Build install --install-base=inst
lib/ManUtils/Build: lib/ManUtils/Build.PL
cd lib/ManUtils && perl Build.PL
diff --git a/lib/ManUtils/ManUtils.pm b/lib/ManUtils/ManUtils.pm
index 641e78c..5a5c37e 100644
--- a/lib/ManUtils/ManUtils.pm
+++ b/lib/ManUtils/ManUtils.pm
@@ -35,6 +35,9 @@ sub fmt {
# Disable hyphenation, since that screws up man page references. :-(
$input = ".hy 0\n.de hy\n..\n$input";
+ # Emulate man-db's --nj option
+ $input = ".na\n.de ad\n..\n$input";
+
$input = encode_utf8($input);
# Call grog to figure out which preprocessors to use.
diff --git a/schema.sql b/schema.sql
index 6ff28c6..a3d4c84 100644
--- a/schema.sql
+++ b/schema.sql
@@ -147,7 +147,10 @@ INSERT INTO systems (id, name, release, short, relorder) VALUES
(85, 'FreeBSD', '9.1', 'freebsd-9.1', 53),
(86, 'FreeBSD', '9.2', 'freebsd-9.2', 54),
(87, 'Ubuntu', '13.10', 'ubuntu-saucy', 18),
- (88, 'Ubuntu', '14.04', 'ubuntu-trusty', 19);
+ (88, 'Ubuntu', '14.04', 'ubuntu-trusty', 19),
+ (89, 'Ubuntu', '14.10', 'ubuntu-utopic', 20),
+ (90, 'Ubuntu', '15.04', 'ubuntu-vivid', 21),
+ (91, 'Debian', '8.0', 'debian-jessie', 12);
-- Removes any path components and compression extensions from the filename.
CREATE OR REPLACE FUNCTION basename_from_filename(fn text) RETURNS text AS $$
diff --git a/util/arch.sh b/util/arch.sh
index 34af891..57ff957 100755
--- a/util/arch.sh
+++ b/util/arch.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Usage: ./arch.sh
# Synchronises the database with an Arch mirror, fetching any packages that
diff --git a/util/common.sh b/util/common.sh
index 8130fab..f30ee18 100644
--- a/util/common.sh
+++ b/util/common.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
CURL="curl -fSs -A manual-page-crawler,info@manned.org --limit-rate 500k"
PSQL="psql -U manned -Awtq"
diff --git a/util/cron.sh b/util/cron.sh
index 872c380..47fdc4b 100755
--- a/util/cron.sh
+++ b/util/cron.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
. ./common.sh
diff --git a/util/deb.sh b/util/deb.sh
index 8bf3053..44efe87 100755
--- a/util/deb.sh
+++ b/util/deb.sh
@@ -271,6 +271,18 @@ ubuntu_trusty() {
syncrepo 88 "http://nl.archive.ubuntu.com/ubuntu/" "trusty-security" "main multiverse restricted universe"
}
+ubuntu_utopic() {
+ syncrepo 89 "http://nl.archive.ubuntu.com/ubuntu/" "utopic" "main multiverse restricted universe"
+ syncrepo 89 "http://nl.archive.ubuntu.com/ubuntu/" "utopic-updates" "main multiverse restricted universe"
+ syncrepo 89 "http://nl.archive.ubuntu.com/ubuntu/" "utopic-security" "main multiverse restricted universe"
+}
+
+ubuntu_vivid() {
+ syncrepo 90 "http://nl.archive.ubuntu.com/ubuntu/" "vivid" "main multiverse restricted universe"
+ syncrepo 90 "http://nl.archive.ubuntu.com/ubuntu/" "vivid-updates" "main multiverse restricted universe"
+ syncrepo 90 "http://nl.archive.ubuntu.com/ubuntu/" "vivid-security" "main multiverse restricted universe"
+}
+
ubuntu_old() {
ubuntu_warty
ubuntu_hoary
@@ -282,6 +294,7 @@ ubuntu_old() {
ubuntu_intrepid
ubuntu_jaunty
ubuntu_karmic
+ ubuntu_lucid
ubuntu_maverick
ubuntu_natty
ubuntu_hardy
@@ -292,9 +305,10 @@ ubuntu_old() {
}
ubuntu_active() {
- ubuntu_lucid # until 2015-04
ubuntu_precise # until 2017-04
ubuntu_trusty # until 2019-04
+ ubuntu_utopic # until 2015-07
+ ubuntu_vivid # until 2016-01
}
ubuntu() {
@@ -359,6 +373,15 @@ debian_wheezy() {
syncrepo 83 "http://ftp.nl.debian.org/debian/" "wheezy-updates" "non-free" "dists/wheezy-updates/non-free/Contents-i386.gz"
}
+debian_jessie() {
+ syncrepo 91 "http://ftp.nl.debian.org/debian/" "jessie" "main" "dists/jessie/main/Contents-i386.gz"
+ syncrepo 91 "http://ftp.nl.debian.org/debian/" "jessie" "contrib" "dists/jessie/contrib/Contents-i386.gz"
+ syncrepo 91 "http://ftp.nl.debian.org/debian/" "jessie" "non-free" "dists/jessie/non-free/Contents-i386.gz"
+ syncrepo 91 "http://ftp.nl.debian.org/debian/" "jessie-updates" "main" "dists/jessie-updates/main/Contents-i386.gz"
+ syncrepo 91 "http://ftp.nl.debian.org/debian/" "jessie-updates" "contrib" "dists/jessie-updates/contrib/Contents-i386.gz"
+ syncrepo 91 "http://ftp.nl.debian.org/debian/" "jessie-updates" "non-free" "dists/jessie-updates/non-free/Contents-i386.gz"
+}
+
debian_old() {
debian_buzz
debian_rex
@@ -375,6 +398,7 @@ debian_old() {
debian_active() {
debian_squeeze
debian_wheezy
+ debian_jessie
}
debian() {
diff --git a/util/freebsd.sh b/util/freebsd.sh
index 7546268..e4427a9 100755
--- a/util/freebsd.sh
+++ b/util/freebsd.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
. ./common.sh
@@ -727,6 +727,14 @@ f9_2() {
check_pkgdir 86 "$MIR/packages"
}
+f9_3() {
+ MIR="http://ftp.dk.freebsd.org/pub/FreeBSD/releases/i386/9.2-RELEASE/"
+ echo "============ $MIR"
+ check_dist 86 "$MIR/base.txz" "core-base" "2013-09-27"
+ check_dist 86 "$MIR/games.txz" "core-games" "2013-09-27"
+ check_pkgdir 86 "$MIR/packages"
+}
+
old() {
f1_0
diff --git a/www/index.pl b/www/index.pl
index 3a43504..8b8eba7 100755
--- a/www/index.pl
+++ b/www/index.pl
@@ -43,16 +43,18 @@ TUWF::set(
# TODO: Abstract this into the systems table?
-$TUWF::OBJ->{pkglinks} = {
- arch => sub { "http://www.archlinux.org/packages/$_[0]{category}/i686/$_[0]{name}/" },
- 'debian-squeeze' => sub { "http://packages.debian.org/squeeze/$_[0]{name}" },
- 'debian-wheezy' => sub { "http://packages.debian.org/wheezy/$_[0]{name}" },
- 'ubuntu-lucid' => sub { "http://packages.ubuntu.com/lucid/$_[0]{name}" },
- 'ubuntu-precise' => sub { "http://packages.ubuntu.com/precise/$_[0]{name}" },
- 'ubuntu-quantal' => sub { "http://packages.ubuntu.com/quantal/$_[0]{name}" },
- 'ubuntu-raring' => sub { "http://packages.ubuntu.com/raring/$_[0]{name}" },
- 'ubuntu-saucy' => sub { "http://packages.ubuntu.com/saucy/$_[0]{name}" },
-};
+$TUWF::OBJ->{pkglinks} = { };
+# arch => sub { "http://www.archlinux.org/packages/$_[0]{category}/i686/$_[0]{name}/" },
+# 'debian-squeeze' => sub { "http://packages.debian.org/squeeze/$_[0]{name}" },
+# 'debian-wheezy' => sub { "http://packages.debian.org/wheezy/$_[0]{name}" },
+# 'ubuntu-lucid' => sub { "http://packages.ubuntu.com/lucid/$_[0]{name}" },
+# 'ubuntu-precise' => sub { "http://packages.ubuntu.com/precise/$_[0]{name}" },
+# 'ubuntu-quantal' => sub { "http://packages.ubuntu.com/quantal/$_[0]{name}" },
+# 'ubuntu-raring' => sub { "http://packages.ubuntu.com/raring/$_[0]{name}" },
+# 'ubuntu-saucy' => sub { "http://packages.ubuntu.com/saucy/$_[0]{name}" },
+# 'ubuntu-trusty' => sub { "http://packages.ubuntu.com/trusty/$_[0]{name}" },
+# 'ubuntu-utopic' => sub { "http://packages.ubuntu.com/utopic/$_[0]{name}" },
+#};
TUWF::register(
@@ -609,7 +611,7 @@ sub htmlHeader {
div id => 'header';
a href => '/', 'manned.org';
form action => '/browse/search', method => 'get';
- input type => 'text', name => 'q', id => 'q';
+ input type => 'text', name => 'q', id => 'q', tabindex => 1;
input type => 'submit', value => ' ';
end;
end;