diff options
author | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:17:40 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:19:39 (GMT) |
commit | adbcf19958300e9b6598990184c8815b945ba0ee (patch) | |
tree | f4283c850ac0ac202c17e78a637ee7ca8147621b /abs/core-testing/ntp | |
parent | 61a68250df10d29b624650948484898334ff22d0 (diff) | |
download | linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2 |
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/core-testing/ntp')
-rwxr-xr-x | abs/core-testing/ntp/PKGBUILD | 89 | ||||
-rw-r--r-- | abs/core-testing/ntp/fix-ipv6.patch | 10 | ||||
-rw-r--r-- | abs/core-testing/ntp/ntp-4.2.4-html2man.patch | 183 | ||||
-rw-r--r-- | abs/core-testing/ntp/ntp-4.2.4_p7-nano.patch | 20 | ||||
-rwxr-xr-x | abs/core-testing/ntp/ntp-client.conf | 11 | ||||
-rwxr-xr-x | abs/core-testing/ntp/ntp.conf | 47 | ||||
-rwxr-xr-x | abs/core-testing/ntp/ntpd | 40 | ||||
-rwxr-xr-x | abs/core-testing/ntp/ntpdate | 30 |
8 files changed, 0 insertions, 430 deletions
diff --git a/abs/core-testing/ntp/PKGBUILD b/abs/core-testing/ntp/PKGBUILD deleted file mode 100755 index 772e0bf..0000000 --- a/abs/core-testing/ntp/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 75563 2010-04-01 20:42:21Z giovanni $ -# Maintainer: dorphell <dorphell@archlinux.org> - -pkgname=ntp -pkgver=4.2.6p2 -pkgrel=3 -pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync" -arch=(i686 x86_64) -license=('custom') -url="http://www.ntp.org/" -depends=('openssl' 'readline' 'libcap') -makedepends=('perl-html-parser') -backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf') -options=('!emptydirs') -source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${pkgver}.tar.gz - ntp-4.2.4_p7-nano.patch - fix-ipv6.patch - ntp-4.2.4-html2man.patch - ntp.conf - ntp-client.conf - ntpd - ntpdate) -sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' '4de6cd3fad1946146107f86d1f161eb835fbb2d3'\ - '3632f8a00838f48e484bca24de06db443cc14fff' '7f8783e243e23c8853a9f9fb5b36f467aab8dc15'\ - '3625ed2aa71d9e0dd04634f32e65d83b76cfe780' 'c8e388f2577b4329da5e77f0455083db6dd97fa8'\ - 'd9b09de9d718a864270e9330e20109e182dfbdd9' '6dfc3b6996f591123ee8938fd0fe7c27eb5c7552') - -build() { - cd "$srcdir/$pkgname-$pkgver" || return 1 - # fix glibc build issue - patch -Np1 -i ../ntp-4.2.4_p7-nano.patch || return 1 - # fix ipv6 support - patch -Np1 -i ../fix-ipv6.patch || return 1 - # fix man page generation - patch -Np1 -i ../ntp-4.2.4-html2man.patch || return 1 - # configure - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - libtoolize --copy --force || return 1 - ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr --mandir=/usr/share/man --enable-linux-caps || return 1 - - # build and install - make || return 1 - make DESTDIR="$pkgdir" install || return 1 - - # install conf files - mkdir -p "$pkgdir/usr/share/ntp" || return 1 - install -D -m644 conf/* "$pkgdir/usr/share/ntp/" || return 1 - - # install launch scripts - mkdir -p "$pkgdir/etc/rc.d" || return 1 - install -D -m755 "$srcdir"/{ntpd,ntpdate} "$pkgdir/etc/rc.d/" || return 1 - - # install man pages - cd html - ../scripts/html2man || return 1 - sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] || return 1 - install -d "$pkgdir"/usr/share/man/man{5,8} - install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" || return 1 - install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" || return 1 - mv "$pkgdir/usr/share/man/man8/ntpd.8" "$pkgdir/usr/share/man/man8/ntp-ntpd.8" || return 1 - cd .. - - # install sample configs - install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf" || return 1 - install -D -m644 "$srcdir/ntp-client.conf" \ - "$pkgdir/etc/conf.d/ntp-client.conf" || return 1 - - # create /var/lib/ntp - mkdir -p "$pkgdir/var/lib/ntp" || return 1 - touch "$pkgdir/var/lib/ntp/.placeholder" || return 1 - - install -Dm644 "$srcdir/$pkgname-$pkgver/COPYRIGHT" "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" -} -md5sums=('cf73cd85f248232c62f8029e6eb05938' - '36c5711228cb0cf48966daa993e06f55' - '9dabdbc6b8cd020f2205515df7972c21' - '1b04e888717bb31479a6087632981723' - '5bd3924f5720b97837969ec4ec4d5e09' - 'c7f50632b69bd4f32cf052d0b1848463' - '46118a8ec2c4f5bbfafd730af21b7c03' - '140855352baeb89da0c6c1c475c18b57') -sha1sums=('04b5e3c3755fe9e5bcec5bd5d29255cfef2102c4' - '4de6cd3fad1946146107f86d1f161eb835fbb2d3' - '3632f8a00838f48e484bca24de06db443cc14fff' - '7f8783e243e23c8853a9f9fb5b36f467aab8dc15' - '3625ed2aa71d9e0dd04634f32e65d83b76cfe780' - 'c8e388f2577b4329da5e77f0455083db6dd97fa8' - 'd9b09de9d718a864270e9330e20109e182dfbdd9' - '6dfc3b6996f591123ee8938fd0fe7c27eb5c7552') diff --git a/abs/core-testing/ntp/fix-ipv6.patch b/abs/core-testing/ntp/fix-ipv6.patch deleted file mode 100644 index eecd766..0000000 --- a/abs/core-testing/ntp/fix-ipv6.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ntp-4.2.4p7-orig/configure.ac 2009-06-18 14:48:12.151346763 +0200 -+++ ntp-4.2.4p7/configure.ac 2009-06-18 14:50:07.054692531 +0200 -@@ -4456,6 +4456,7 @@ - [ - AC_LANG_PROGRAM( - [ -+ #define _GNU_SOURCE - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> diff --git a/abs/core-testing/ntp/ntp-4.2.4-html2man.patch b/abs/core-testing/ntp/ntp-4.2.4-html2man.patch deleted file mode 100644 index 333d452..0000000 --- a/abs/core-testing/ntp/ntp-4.2.4-html2man.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- ntp-4.2.4/scripts/html2man.in.html2man 2006-06-06 22:17:10.000000000 +0200 -+++ ntp-4.2.4/scripts/html2man.in 2007-01-08 12:47:31.000000000 +0100 -@@ -23,10 +23,10 @@ - 'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'], - 'ntpdate' => ['ntpdate', 8, 'ntpd(8)'], - 'ntpdc' => ['ntpdc', 8, 'ntpd(8)'], -- 'ntptime' => ['ntpdtime', 8, 'ntpd(8), ntpdate(8)'], -+ 'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'], - 'ntptrace' => ['ntptrace', 8, 'ntpd(8)'], - 'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'], -- 'confopt' => ['ntp.conf', 5, 'ntpd(8)'], -+ 'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'], - 'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'], - 'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'], - 'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'], -@@ -34,17 +34,8 @@ - 'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']); - - # Disclaimer to go in SEE ALSO section of the man page --$seealso_disclaimer = 'These man pages are automatically hacked from the main NTP ' . -- 'documentation pages, which are maintained in HTML format. These files are ' . -- 'included in the NTP source distribution. If you installed NTP from a binary ' . -- 'package, or it came pre-installed on your system, chances are the documentation ' . -- 'was also included in the usual place for your system. The HTML files are more ' . -- 'correct and complete than these man pages, which are provided for your reference ' . -- 'only.'; -- --# Disclaimer to go right at the top --$top_disclaimer = 'This file was automatically generated from HTML source, and may be ' . -- 'incorrect. See the SEE ALSO section at the end of this file for more info'; -+$seealso_disclaimer = "Primary source of documentation: /usr/share/doc/ntp-*\n\n" . -+ "This file was automatically generated from HTML source.\n"; - - mkdir $MANDIR, 0777; - mkdir "$MANDIR/man8", 0777; -@@ -64,7 +55,8 @@ - $fileinfo = $manfiles{$filename}; - - $p = HTML::TokeParser->new("$filename.html") || die "Can't open $filename.html: $!"; -- open(MANOUT, ">$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]") -+ $fileout = "$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]"; -+ open(MANOUT, ">$fileout") - || die "Can't open: $!"; - - $p->get_tag("title"); -@@ -73,7 +65,6 @@ - - # Setup man header - print MANOUT ".TH " . $fileinfo->[0] . " " . $fileinfo->[1] . "\n"; -- print MANOUT ".UC 4\n"; - print MANOUT ".SH NAME\n"; - $pat = $fileinfo->[0]; - if ($name =~ /$pat/) { -@@ -81,10 +72,12 @@ - # Add the manpage name, if not in the HTML title already - print MANOUT "$fileinfo->[0] - "; - } -- print MANOUT "$name\n\n"; -- -- print MANOUT "$top_disclaimer\n"; -+ print MANOUT "$name\n.SH \\ \n\n"; - -+ @fontstack = (); -+ $deflevel = 0; -+ $pre = 0; -+ $ignore = 0; - # Now start scanning. We basically print everything after translating some tags. - # $token->[0] has "T", "S", "E" for Text, Start, End - # $token->[1] has the tag name, or text (for "T" case) -@@ -92,19 +85,37 @@ - while (my $token = $p->get_token) { - if($token->[0] eq "T") { - my $text = $token->[1]; -- if($tag) { -- $text =~ s/^[\n ]*//; -- $text =~ s/[\n ]*$/ /; -+ if (!$pre) { -+ if($tag) { -+ $text =~ s/^[\n\t ]*//; -+ } -+ $text =~ s/^[\n\t ][\n\t ]+$//; -+ $text =~ s/[\n\t ]+/ /g; -+ $text =~ s/ \;/ /g; -+ $text =~ s/>\;/>/g; -+ $text =~ s/<\;/</g; -+ $text =~ s/"\;/"/g; -+ $text =~ s/&\;/&/g; -+ $text =~ s/^\./\\[char46]/; - } -- $text =~ s/ \;/ /g; -- $text =~ s/^\./\\./; - print MANOUT "$text"; - $tag = 0; - } - if($token->[0] eq "S") { - if($token->[1] eq "h4") { - my $text = uc($p->get_trimmed_text("/h4")); -- print MANOUT ".SH $text\n"; -+ # ignore these two sections in ntpd.html -+ if ($filename eq "ntpd" && -+ ($text eq "FILES" || $text eq "CONFIGURATION OPTIONS")) { -+ $ignore = 1; -+ close(MANOUT); -+ open(MANOUT, ">/dev/null"); -+ } elsif ($ignore) { -+ $ignore = 0; -+ close(MANOUT); -+ open(MANOUT, ">>$fileout"); -+ } -+ print MANOUT "\n\n.SH $text\n"; - } - if($token->[1] eq "tt") { - push @fontstack, "tt"; -@@ -118,22 +129,30 @@ - my $text = $p->get_trimmed_text("/address"); - print MANOUT "\n.SH AUTHOR\n$text\n"; - } -- if($token->[1] eq "dt") { -- $tmp = $deflevel-4; -- print MANOUT "\n.RS $tmp\n"; -+ if($token->[1] eq "dt" || $token->[1] eq "br" && $deflevel > 0) { -+ print MANOUT "\n.TP 8\n"; - $tag = 1; - } - if($token->[1] eq "dd") { -- print MANOUT "\n.RS $deflevel\n"; -+ print MANOUT "\n"; - $tag = 1; - } - if($token->[1] eq "dl") { -- $deflevel+=4; -+ $deflevel+=1; -+ if ($deflevel > 0) { -+ print MANOUT "\n.RS ", $deflevel > 1 ? 8 : 0; -+ } -+ } -+ if($token->[1] eq "p") { -+ print MANOUT "\n"; -+ } -+ if($token->[1] eq "pre") { -+ print MANOUT "\n.nf"; -+ $pre = 1; - } - } - elsif($token->[0] eq "E") { -- if($token->[1] eq "dd") { -- print MANOUT "\n.RE\n"; -+ if($token->[1] eq "h4") { - $tag = 1; - } - if($token->[1] eq "tt") { -@@ -157,15 +176,27 @@ - print MANOUT "$fontswitch"; - } - if($token->[1] eq "dl") { -- $deflevel-=4; -+ if ($deflevel > 0) { -+ print MANOUT "\n.RE"; -+ } -+ print MANOUT "\n"; -+ $deflevel-=1; - } -- if($token->[1] eq "dt") { -- print MANOUT "\n.RE"; -+ if($token->[1] eq "p") { -+ print MANOUT "\n"; - $tag = 1; - } -+ if($token->[1] eq "pre") { -+ print MANOUT "\n.fi"; -+ $pre = 0; -+ } - } - } -- print MANOUT ".SH SEE ALSO\n\n"; -+ if ($ignore) { -+ close(MANOUT); -+ open(MANOUT, ">>$fileout"); -+ } -+ print MANOUT "\n.SH SEE ALSO\n\n"; - print MANOUT "$fileinfo->[2]\n\n"; - print MANOUT "$seealso_disclaimer\n"; - close(MANOUT); diff --git a/abs/core-testing/ntp/ntp-4.2.4_p7-nano.patch b/abs/core-testing/ntp/ntp-4.2.4_p7-nano.patch deleted file mode 100644 index b31ea0a..0000000 --- a/abs/core-testing/ntp/ntp-4.2.4_p7-nano.patch +++ /dev/null @@ -1,20 +0,0 @@ -http://bugs.gentoo.org/270483 - -ripped from fedora - ---- ntp-4.2.4p7/include/ntp_syscall.h -+++ ntp-4.2.4p7/include/ntp_syscall.h -@@ -14,5 +14,13 @@ - # include <sys/timex.h> - #endif - -+#if defined(ADJ_NANO) && !defined(MOD_NANO) -+#define MOD_NANO ADJ_NANO -+#endif -+ -+#if defined(ADJ_TAI) && !defined(MOD_TAI) -+#define MOD_TAI ADJ_TAI -+#endif -+ - #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD diff --git a/abs/core-testing/ntp/ntp-client.conf b/abs/core-testing/ntp/ntp-client.conf deleted file mode 100755 index a0463b7..0000000 --- a/abs/core-testing/ntp/ntp-client.conf +++ /dev/null @@ -1,11 +0,0 @@ -# change this to a server closer to your location -NTP_CLIENT_SERVER="pool.ntp.org" - -# client options -NTP_CLIENT_OPTION="-b -u" - -# timeout for the ntp-client -NTPCLIENT_TIMEOUT=10 - -# arguments passed to ntpd when started -NTPD_ARGS="-g" diff --git a/abs/core-testing/ntp/ntp.conf b/abs/core-testing/ntp/ntp.conf deleted file mode 100755 index 93fc919..0000000 --- a/abs/core-testing/ntp/ntp.conf +++ /dev/null @@ -1,47 +0,0 @@ -# NOTES: -# - you should only have to update the server line below -# - if you start getting lines like 'restrict' and 'fudge' -# and you didnt add them, AND you run dhcpcd on your -# network interfaces, be sure to add '-Y -N' to the -# dhcpcd_ethX variables in /etc/conf.d/net - -# Name of the servers ntpd should sync with -# Please respect the access policy as stated by the responsible person. -#server ntp.example.tld iburst - -server pool.ntp.org - -## -# A list of available servers can be found here: -# http://www.pool.ntp.org/ -# http://www.pool.ntp.org/#use -# A good way to get servers for your machine is: -# netselect -s 3 pool.ntp.org -## - -# you should not need to modify the following paths -driftfile /var/lib/ntp/ntp.drift - -#server ntplocal.example.com prefer -#server timeserver.example.org - -# Warning: Using default NTP settings will leave your NTP -# server accessible to all hosts on the Internet. - -# If you want to deny all machines (including your own) -# from accessing the NTP server, uncomment: -#restrict default ignore - - -# To deny other machines from changing the -# configuration but allow localhost: -restrict default nomodify nopeer -restrict 127.0.0.1 - - -# To allow machines within your network to synchronize -# their clocks with your server, but ensure they are -# not allowed to configure the server or used as peers -# to synchronize against, uncomment this line. -# -#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap diff --git a/abs/core-testing/ntp/ntpd b/abs/core-testing/ntp/ntpd deleted file mode 100755 index 56f6248..0000000 --- a/abs/core-testing/ntp/ntpd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntp-client.conf - -PID=`pidof -o %PPID /usr/bin/ntpd` -case "$1" in - start) - stat_busy "Starting NTP Daemon" - if [ -z "$PID" ]; then - /usr/bin/ntpd $NTPD_ARGS & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID /usr/bin/ntpd` - echo $PID > /var/run/ntpd.pid - add_daemon ntpd - stat_done - fi - ;; - stop) - stat_busy "Stopping NTP Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ntpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/abs/core-testing/ntp/ntpdate b/abs/core-testing/ntp/ntpdate deleted file mode 100755 index 643ae19..0000000 --- a/abs/core-testing/ntp/ntpdate +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntp-client.conf - -case "$1" in - start) - stat_busy "Starting NTP Client" - /usr/bin/ntpdate $NTP_CLIENT_OPTION -t $NTPCLIENT_TIMEOUT $NTP_CLIENT_SERVER > /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ntpdate - stat_done - fi - ;; - stop) - stat_busy "Stopping NTP Client" - rm_daemon ntpdate - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac |