[arch-commits] Commit in tftp-hpa/repos (24 files)
Thomas Bächler
thomas at archlinux.org
Sat Sep 22 12:53:42 UTC 2012
Date: Saturday, September 22, 2012 @ 08:53:41
Author: thomas
Revision: 166929
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
tftp-hpa/repos/extra-i686/LICENSE
(from rev 166908, tftp-hpa/trunk/LICENSE)
tftp-hpa/repos/extra-i686/PKGBUILD
(from rev 166908, tftp-hpa/trunk/PKGBUILD)
tftp-hpa/repos/extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch
(from rev 166908, tftp-hpa/trunk/tftp-hpa-0.49-fortify-strcpy-crash.patch)
tftp-hpa/repos/extra-i686/tftpd.conf
(from rev 166908, tftp-hpa/trunk/tftpd.conf)
tftp-hpa/repos/extra-i686/tftpd.rc
(from rev 166908, tftp-hpa/trunk/tftpd.rc)
tftp-hpa/repos/extra-i686/tftpd.service
(from rev 166908, tftp-hpa/trunk/tftpd.service)
tftp-hpa/repos/extra-i686/tftpd.socket
(from rev 166908, tftp-hpa/trunk/tftpd.socket)
tftp-hpa/repos/extra-x86_64/LICENSE
(from rev 166928, tftp-hpa/trunk/LICENSE)
tftp-hpa/repos/extra-x86_64/PKGBUILD
(from rev 166928, tftp-hpa/trunk/PKGBUILD)
tftp-hpa/repos/extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch
(from rev 166928, tftp-hpa/trunk/tftp-hpa-0.49-fortify-strcpy-crash.patch)
tftp-hpa/repos/extra-x86_64/tftpd.conf
(from rev 166928, tftp-hpa/trunk/tftpd.conf)
tftp-hpa/repos/extra-x86_64/tftpd.rc
(from rev 166928, tftp-hpa/trunk/tftpd.rc)
tftp-hpa/repos/extra-x86_64/tftpd.service
(from rev 166928, tftp-hpa/trunk/tftpd.service)
tftp-hpa/repos/extra-x86_64/tftpd.socket
(from rev 166928, tftp-hpa/trunk/tftpd.socket)
Deleted:
tftp-hpa/repos/extra-i686/LICENSE
tftp-hpa/repos/extra-i686/PKGBUILD
tftp-hpa/repos/extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch
tftp-hpa/repos/extra-i686/tftpd.conf
tftp-hpa/repos/extra-i686/tftpd.rc
tftp-hpa/repos/extra-x86_64/LICENSE
tftp-hpa/repos/extra-x86_64/PKGBUILD
tftp-hpa/repos/extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch
tftp-hpa/repos/extra-x86_64/tftpd.conf
tftp-hpa/repos/extra-x86_64/tftpd.rc
-------------------------------------------------------+
extra-i686/LICENSE | 64 +++++------
extra-i686/PKGBUILD | 91 ++++++++--------
extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch | 52 ++++-----
extra-i686/tftpd.conf | 8 -
extra-i686/tftpd.rc | 76 ++++++-------
extra-i686/tftpd.service | 8 +
extra-i686/tftpd.socket | 5
extra-x86_64/LICENSE | 64 +++++------
extra-x86_64/PKGBUILD | 91 ++++++++--------
extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch | 52 ++++-----
extra-x86_64/tftpd.conf | 8 -
extra-x86_64/tftpd.rc | 76 ++++++-------
extra-x86_64/tftpd.service | 8 +
extra-x86_64/tftpd.socket | 5
14 files changed, 324 insertions(+), 284 deletions(-)
Deleted: extra-i686/LICENSE
===================================================================
--- extra-i686/LICENSE 2012-09-22 12:43:07 UTC (rev 166928)
+++ extra-i686/LICENSE 2012-09-22 12:53:41 UTC (rev 166929)
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
Copied: tftp-hpa/repos/extra-i686/LICENSE (from rev 166908, tftp-hpa/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE (rev 0)
+++ extra-i686/LICENSE 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1983, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-09-22 12:43:07 UTC (rev 166928)
+++ extra-i686/PKGBUILD 2012-09-22 12:53:41 UTC (rev 166929)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Contributor: Jose Javier <jojapa at terra.es>
-pkgname=tftp-hpa
-pkgver=5.2
-pkgrel=2
-pkgdesc="Official tftp server"
-arch=('i686' 'x86_64')
-url="http://www.kernel.org/pub/software/network/tftp/"
-license=('BSD')
-depends=('readline>=6.0.00')
-conflicts=('netkit-tftp')
-backup=('etc/conf.d/tftpd')
-source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz
- tftpd.rc
- tftpd.conf
- LICENSE
- tftp-hpa-0.49-fortify-strcpy-crash.patch)
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- # fix #28103
- patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch
- ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make INSTALLROOT="${pkgdir}" install
- install -d "${pkgdir}/etc/rc.d"
- install -d "${pkgdir}/var/tftpboot"
- install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd"
- install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd"
- rm "${pkgdir}/usr/share/man/man8/tftpd.8"
- install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
- '83fbb6f52205d95951a3c059e5351ca2'
- '414a79dc891bced056d99a9bb790fc9e'
- '6ce21e27b6fdc1a1adf85c81e42aeecf'
- '22e8629ef19bc276a102c5d4d284c1bd')
Copied: tftp-hpa/repos/extra-i686/PKGBUILD (from rev 166908, tftp-hpa/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: dorphell <dorphell at archlinux.org>
+# Contributor: Jose Javier <jojapa at terra.es>
+pkgname=tftp-hpa
+pkgver=5.2
+pkgrel=3
+pkgdesc="Official tftp server"
+arch=('i686' 'x86_64')
+url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/"
+license=('BSD')
+depends=('readline>=6.0.00')
+conflicts=('netkit-tftp')
+backup=('etc/conf.d/tftpd')
+source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz
+ tftpd.rc
+ tftpd.conf
+ LICENSE
+ tftpd.service
+ tftpd.socket
+ tftp-hpa-0.49-fortify-strcpy-crash.patch)
+md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
+ '83fbb6f52205d95951a3c059e5351ca2'
+ 'f41f484f94e91175e9183e872a2bff3b'
+ '6ce21e27b6fdc1a1adf85c81e42aeecf'
+ '165b98f814f74568635a720e674d7f18'
+ 'a23369ea33be8b4a5427ec2cfc5373dd'
+ '22e8629ef19bc276a102c5d4d284c1bd')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # fix #28103
+ patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch
+ ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make INSTALLROOT="${pkgdir}" install
+ install -d "${pkgdir}/etc/rc.d"
+ install -d "${pkgdir}/srv/tftp"
+ install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd"
+ install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd"
+ install -D -m655 "${srcdir}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service"
+ install -D -m655 "${srcdir}/tftpd.socket" "${pkgdir}/usr/lib/systemd/system/tftpd.socket"
+ install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ # Remove conflict with iputils
+ rm "${pkgdir}/usr/share/man/man8/tftpd.8"
+}
Deleted: extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch
===================================================================
--- extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch 2012-09-22 12:43:07 UTC (rev 166928)
+++ extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch 2012-09-22 12:53:41 UTC (rev 166929)
@@ -1,26 +0,0 @@
-diff -urN tftp-hpa-0.49.orig/tftp/tftp.c tftp-hpa-0.49/tftp/tftp.c
---- tftp-hpa-0.49.orig/tftp/tftp.c 2008-10-20 18:08:31.000000000 -0400
-+++ tftp-hpa-0.49/tftp/tftp.c 2009-08-05 09:47:18.072585848 -0400
-@@ -279,15 +279,16 @@
- struct tftphdr *tp, const char *mode)
- {
- char *cp;
-+ size_t len;
-
- tp->th_opcode = htons((u_short) request);
- cp = (char *)&(tp->th_stuff);
-- strcpy(cp, name);
-- cp += strlen(name);
-- *cp++ = '\0';
-- strcpy(cp, mode);
-- cp += strlen(mode);
-- *cp++ = '\0';
-+ len = strlen(name) + 1;
-+ memcpy(cp, name, len);
-+ cp += len;
-+ len = strlen(mode) + 1;
-+ memcpy(cp, mode, len);
-+ cp += len;
- return (cp - (char *)tp);
- }
-
Copied: tftp-hpa/repos/extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch (from rev 166908, tftp-hpa/trunk/tftp-hpa-0.49-fortify-strcpy-crash.patch)
===================================================================
--- extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch (rev 0)
+++ extra-i686/tftp-hpa-0.49-fortify-strcpy-crash.patch 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,26 @@
+diff -urN tftp-hpa-0.49.orig/tftp/tftp.c tftp-hpa-0.49/tftp/tftp.c
+--- tftp-hpa-0.49.orig/tftp/tftp.c 2008-10-20 18:08:31.000000000 -0400
++++ tftp-hpa-0.49/tftp/tftp.c 2009-08-05 09:47:18.072585848 -0400
+@@ -279,15 +279,16 @@
+ struct tftphdr *tp, const char *mode)
+ {
+ char *cp;
++ size_t len;
+
+ tp->th_opcode = htons((u_short) request);
+ cp = (char *)&(tp->th_stuff);
+- strcpy(cp, name);
+- cp += strlen(name);
+- *cp++ = '\0';
+- strcpy(cp, mode);
+- cp += strlen(mode);
+- *cp++ = '\0';
++ len = strlen(name) + 1;
++ memcpy(cp, name, len);
++ cp += len;
++ len = strlen(mode) + 1;
++ memcpy(cp, mode, len);
++ cp += len;
+ return (cp - (char *)tp);
+ }
+
Deleted: extra-i686/tftpd.conf
===================================================================
--- extra-i686/tftpd.conf 2012-09-22 12:43:07 UTC (rev 166928)
+++ extra-i686/tftpd.conf 2012-09-22 12:53:41 UTC (rev 166929)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to TFTPD
-#
-TFTPD_ARGS="-l -s /var/tftpboot"
Copied: tftp-hpa/repos/extra-i686/tftpd.conf (from rev 166908, tftp-hpa/trunk/tftpd.conf)
===================================================================
--- extra-i686/tftpd.conf (rev 0)
+++ extra-i686/tftpd.conf 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to TFTPD
+#
+TFTPD_ARGS="-l -s /srv/tftp/"
Deleted: extra-i686/tftpd.rc
===================================================================
--- extra-i686/tftpd.rc 2012-09-22 12:43:07 UTC (rev 166928)
+++ extra-i686/tftpd.rc 2012-09-22 12:53:41 UTC (rev 166929)
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-TFTPD_ARGS=
-[ -f /etc/conf.d/tftpd ] && . /etc/conf.d/tftpd
-
-PID=$(pidof -o %PPID /usr/sbin/in.tftpd)
-case "$1" in
- start)
- stat_busy "Starting TFTPD"
- [ -z "$PID" ] && /usr/sbin/in.tftpd ${TFTPD_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon tftpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping TFTPD"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon tftpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: tftp-hpa/repos/extra-i686/tftpd.rc (from rev 166908, tftp-hpa/trunk/tftpd.rc)
===================================================================
--- extra-i686/tftpd.rc (rev 0)
+++ extra-i686/tftpd.rc 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+TFTPD_ARGS=
+[ -f /etc/conf.d/tftpd ] && . /etc/conf.d/tftpd
+
+PID=$(pidof -o %PPID /usr/sbin/in.tftpd)
+case "$1" in
+ start)
+ stat_busy "Starting TFTPD"
+ [ -z "$PID" ] && /usr/sbin/in.tftpd ${TFTPD_ARGS}
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon tftpd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping TFTPD"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon tftpd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Copied: tftp-hpa/repos/extra-i686/tftpd.service (from rev 166908, tftp-hpa/trunk/tftpd.service)
===================================================================
--- extra-i686/tftpd.service (rev 0)
+++ extra-i686/tftpd.service 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,8 @@
+[Unit]
+Description=hpa's original TFTP daemon
+
+[Service]
+ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
Copied: tftp-hpa/repos/extra-i686/tftpd.socket (from rev 166908, tftp-hpa/trunk/tftpd.socket)
===================================================================
--- extra-i686/tftpd.socket (rev 0)
+++ extra-i686/tftpd.socket 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,5 @@
+[Socket]
+ListenDatagram=69
+
+[Install]
+WantedBy=sockets.target
Deleted: extra-x86_64/LICENSE
===================================================================
--- extra-x86_64/LICENSE 2012-09-22 12:43:07 UTC (rev 166928)
+++ extra-x86_64/LICENSE 2012-09-22 12:53:41 UTC (rev 166929)
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
Copied: tftp-hpa/repos/extra-x86_64/LICENSE (from rev 166928, tftp-hpa/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE (rev 0)
+++ extra-x86_64/LICENSE 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1983, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-09-22 12:43:07 UTC (rev 166928)
+++ extra-x86_64/PKGBUILD 2012-09-22 12:53:41 UTC (rev 166929)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Contributor: Jose Javier <jojapa at terra.es>
-pkgname=tftp-hpa
-pkgver=5.2
-pkgrel=2
-pkgdesc="Official tftp server"
-arch=('i686' 'x86_64')
-url="http://www.kernel.org/pub/software/network/tftp/"
-license=('BSD')
-depends=('readline>=6.0.00')
-conflicts=('netkit-tftp')
-backup=('etc/conf.d/tftpd')
-source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz
- tftpd.rc
- tftpd.conf
- LICENSE
- tftp-hpa-0.49-fortify-strcpy-crash.patch)
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- # fix #28103
- patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch
- ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make INSTALLROOT="${pkgdir}" install
- install -d "${pkgdir}/etc/rc.d"
- install -d "${pkgdir}/var/tftpboot"
- install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd"
- install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd"
- rm "${pkgdir}/usr/share/man/man8/tftpd.8"
- install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
- '83fbb6f52205d95951a3c059e5351ca2'
- '414a79dc891bced056d99a9bb790fc9e'
- '6ce21e27b6fdc1a1adf85c81e42aeecf'
- '22e8629ef19bc276a102c5d4d284c1bd')
Copied: tftp-hpa/repos/extra-x86_64/PKGBUILD (from rev 166928, tftp-hpa/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: dorphell <dorphell at archlinux.org>
+# Contributor: Jose Javier <jojapa at terra.es>
+pkgname=tftp-hpa
+pkgver=5.2
+pkgrel=3
+pkgdesc="Official tftp server"
+arch=('i686' 'x86_64')
+url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/"
+license=('BSD')
+depends=('readline>=6.0.00')
+conflicts=('netkit-tftp')
+backup=('etc/conf.d/tftpd')
+source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz
+ tftpd.rc
+ tftpd.conf
+ LICENSE
+ tftpd.service
+ tftpd.socket
+ tftp-hpa-0.49-fortify-strcpy-crash.patch)
+md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
+ '83fbb6f52205d95951a3c059e5351ca2'
+ 'f41f484f94e91175e9183e872a2bff3b'
+ '6ce21e27b6fdc1a1adf85c81e42aeecf'
+ '165b98f814f74568635a720e674d7f18'
+ 'a23369ea33be8b4a5427ec2cfc5373dd'
+ '22e8629ef19bc276a102c5d4d284c1bd')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # fix #28103
+ patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch
+ ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make INSTALLROOT="${pkgdir}" install
+ install -d "${pkgdir}/etc/rc.d"
+ install -d "${pkgdir}/srv/tftp"
+ install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd"
+ install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd"
+ install -D -m655 "${srcdir}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service"
+ install -D -m655 "${srcdir}/tftpd.socket" "${pkgdir}/usr/lib/systemd/system/tftpd.socket"
+ install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ # Remove conflict with iputils
+ rm "${pkgdir}/usr/share/man/man8/tftpd.8"
+}
Deleted: extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch
===================================================================
--- extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch 2012-09-22 12:43:07 UTC (rev 166928)
+++ extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch 2012-09-22 12:53:41 UTC (rev 166929)
@@ -1,26 +0,0 @@
-diff -urN tftp-hpa-0.49.orig/tftp/tftp.c tftp-hpa-0.49/tftp/tftp.c
---- tftp-hpa-0.49.orig/tftp/tftp.c 2008-10-20 18:08:31.000000000 -0400
-+++ tftp-hpa-0.49/tftp/tftp.c 2009-08-05 09:47:18.072585848 -0400
-@@ -279,15 +279,16 @@
- struct tftphdr *tp, const char *mode)
- {
- char *cp;
-+ size_t len;
-
- tp->th_opcode = htons((u_short) request);
- cp = (char *)&(tp->th_stuff);
-- strcpy(cp, name);
-- cp += strlen(name);
-- *cp++ = '\0';
-- strcpy(cp, mode);
-- cp += strlen(mode);
-- *cp++ = '\0';
-+ len = strlen(name) + 1;
-+ memcpy(cp, name, len);
-+ cp += len;
-+ len = strlen(mode) + 1;
-+ memcpy(cp, mode, len);
-+ cp += len;
- return (cp - (char *)tp);
- }
-
Copied: tftp-hpa/repos/extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch (from rev 166928, tftp-hpa/trunk/tftp-hpa-0.49-fortify-strcpy-crash.patch)
===================================================================
--- extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch (rev 0)
+++ extra-x86_64/tftp-hpa-0.49-fortify-strcpy-crash.patch 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,26 @@
+diff -urN tftp-hpa-0.49.orig/tftp/tftp.c tftp-hpa-0.49/tftp/tftp.c
+--- tftp-hpa-0.49.orig/tftp/tftp.c 2008-10-20 18:08:31.000000000 -0400
++++ tftp-hpa-0.49/tftp/tftp.c 2009-08-05 09:47:18.072585848 -0400
+@@ -279,15 +279,16 @@
+ struct tftphdr *tp, const char *mode)
+ {
+ char *cp;
++ size_t len;
+
+ tp->th_opcode = htons((u_short) request);
+ cp = (char *)&(tp->th_stuff);
+- strcpy(cp, name);
+- cp += strlen(name);
+- *cp++ = '\0';
+- strcpy(cp, mode);
+- cp += strlen(mode);
+- *cp++ = '\0';
++ len = strlen(name) + 1;
++ memcpy(cp, name, len);
++ cp += len;
++ len = strlen(mode) + 1;
++ memcpy(cp, mode, len);
++ cp += len;
+ return (cp - (char *)tp);
+ }
+
Deleted: extra-x86_64/tftpd.conf
===================================================================
--- extra-x86_64/tftpd.conf 2012-09-22 12:43:07 UTC (rev 166928)
+++ extra-x86_64/tftpd.conf 2012-09-22 12:53:41 UTC (rev 166929)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to TFTPD
-#
-TFTPD_ARGS="-l -s /var/tftpboot"
Copied: tftp-hpa/repos/extra-x86_64/tftpd.conf (from rev 166928, tftp-hpa/trunk/tftpd.conf)
===================================================================
--- extra-x86_64/tftpd.conf (rev 0)
+++ extra-x86_64/tftpd.conf 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to TFTPD
+#
+TFTPD_ARGS="-l -s /srv/tftp/"
Deleted: extra-x86_64/tftpd.rc
===================================================================
--- extra-x86_64/tftpd.rc 2012-09-22 12:43:07 UTC (rev 166928)
+++ extra-x86_64/tftpd.rc 2012-09-22 12:53:41 UTC (rev 166929)
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-TFTPD_ARGS=
-[ -f /etc/conf.d/tftpd ] && . /etc/conf.d/tftpd
-
-PID=$(pidof -o %PPID /usr/sbin/in.tftpd)
-case "$1" in
- start)
- stat_busy "Starting TFTPD"
- [ -z "$PID" ] && /usr/sbin/in.tftpd ${TFTPD_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon tftpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping TFTPD"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon tftpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: tftp-hpa/repos/extra-x86_64/tftpd.rc (from rev 166928, tftp-hpa/trunk/tftpd.rc)
===================================================================
--- extra-x86_64/tftpd.rc (rev 0)
+++ extra-x86_64/tftpd.rc 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+TFTPD_ARGS=
+[ -f /etc/conf.d/tftpd ] && . /etc/conf.d/tftpd
+
+PID=$(pidof -o %PPID /usr/sbin/in.tftpd)
+case "$1" in
+ start)
+ stat_busy "Starting TFTPD"
+ [ -z "$PID" ] && /usr/sbin/in.tftpd ${TFTPD_ARGS}
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon tftpd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping TFTPD"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon tftpd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Copied: tftp-hpa/repos/extra-x86_64/tftpd.service (from rev 166928, tftp-hpa/trunk/tftpd.service)
===================================================================
--- extra-x86_64/tftpd.service (rev 0)
+++ extra-x86_64/tftpd.service 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,8 @@
+[Unit]
+Description=hpa's original TFTP daemon
+
+[Service]
+ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
Copied: tftp-hpa/repos/extra-x86_64/tftpd.socket (from rev 166928, tftp-hpa/trunk/tftpd.socket)
===================================================================
--- extra-x86_64/tftpd.socket (rev 0)
+++ extra-x86_64/tftpd.socket 2012-09-22 12:53:41 UTC (rev 166929)
@@ -0,0 +1,5 @@
+[Socket]
+ListenDatagram=69
+
+[Install]
+WantedBy=sockets.target
More information about the arch-commits
mailing list