Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5e282a2bdc0eb7d0ad4ead81be2edf804e15fa8
commit d5e282a2bdc0eb7d0ad4ead81be2edf804e15fa8 Author: Miklos Vajna <[email protected]> Date: Thu Aug 23 07:48:55 2012 +0200 apache-2.2.22-2-x86_64 - drop sysv compat diff --git a/source/network/apache/FrugalBuild b/source/network/apache/FrugalBuild index 13097e2..366d3cc 100644 --- a/source/network/apache/FrugalBuild +++ b/source/network/apache/FrugalBuild @@ -4,7 +4,7 @@ pkgname=apache pkgver=2.2.22 -pkgrel=1 +pkgrel=2 pkgdesc="A high performance Unix-based HTTP server (with SSL)" url="http://httpd.apache.org/"; backup=(etc/httpd/conf/{httpd.conf,ssl.conf,ssl.crt/server.crt,ssl.csr/server.csr,ssl.key/server.key} \ @@ -15,12 +15,10 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://httpd.apache.org/download.cgi |grep 'best available'|sed 's/.* \([0-9.]\+\) i.*/\1/;q'" source=(http://www.apache.org/dist/httpd/httpd-$pkgver.tar.gz \ http://ftp.frugalware.org/pub/other/sources/apache/mkcert.tar.gz \ - rc.httpd rc.httpd-hu.po httpd.service httpd.conf ssl.conf \ + httpd.service httpd.conf ssl.conf \ README.Frugalware index.html http://frugalware.org/images/frugalware.png) sha1sums=('bf3bbfda967ac900348e697f26fe86b25695efe9' \ 'bf72ba3f894187f0375376bbfda45501d6ea7251' \ - '891e6d71048b5a6f661ad5cd8081583409bc4f0f' \ - '4528b120312e89db4ffbb93fcbb779b2b3bbb928' \ 'df1c75abd1deb203174bfa0f946b3f3f4f54c0b1' \ 'c543d05035c4db1b2e762a9f4510413699a29f03' \ 'e3f943dd5f96b77e90c003100c87757bb109b6f5' \ @@ -28,7 +26,6 @@ sha1sums=('bf3bbfda967ac900348e697f26fe86b25695efe9' \ 'f7c90c628f8a4ee77222ad1d1a30106bc253b2ec' \ '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e') -_F_sysvinit_units=(httpd) _F_systemd_units=(httpd=) Finclude systemd @@ -53,7 +50,6 @@ build() Frm etc/ssl.conf Ffile httpd.conf /etc/httpd/conf/httpd.conf Ffile ssl.conf /etc/httpd/conf/ssl.conf - Frcd2 httpd Fdoc README.Frugalware Frm /var/www/html/index.html Ffile /var/www/html/index.html diff --git a/source/network/apache/rc.httpd b/source/network/apache/rc.httpd deleted file mode 100644 index bbb861b..0000000 --- a/source/network/apache/rc.httpd +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <[email protected]> -# (c) 2003 Vajna Miklos <[email protected]> -# rc.httpd for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 85 15 -# description: Apache is a World Wide Web server. It is used to serve \ -# HTML files and CGI. - -source /lib/initscripts/functions -TEXTDOMAIN=httpd -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart start status stop) -daemon=$"Apache web server" - -pid="pidof httpd 2> /dev/null" - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" ]; then - /usr/sbin/apachectl start 2>/dev/null 1>/dev/null - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z "$(eval $pid)" ] ;then - /usr/sbin/apachectl stop 2>/dev/null 1>/dev/null - ok $? - else - ok 999 - fi -} - -rc_restart() -{ - if [ ! -z "$(eval $pid)" ]; then - apachectl graceful - else - ok 999 - fi -} - -rc_exec $1 diff --git a/source/network/apache/rc.httpd-hu.po b/source/network/apache/rc.httpd-hu.po deleted file mode 100644 index 766d580..0000000 --- a/source/network/apache/rc.httpd-hu.po +++ /dev/null @@ -1,21 +0,0 @@ -# rc.httpd -# Copyright (C) YEAR THE rc.httpd'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.httpd package. -# Miklos Vajna <[email protected]>, 2005. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.httpd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-10 18:24+0100\n" -"PO-Revision-Date: 2005-12-10 18:25+0100\n" -"Last-Translator: Miklos Vajna <[email protected]>\n" -"Language-Team: Hungarian <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.httpd:17 -msgid "Apache web server" -msgstr "Apache webszerver" diff --git a/source/network/apache/rc.httpd.pot b/source/network/apache/rc.httpd.pot deleted file mode 100644 index a04bc81..0000000 --- a/source/network/apache/rc.httpd.pot +++ /dev/null @@ -1,21 +0,0 @@ -# rc.httpd -# Copyright (C) YEAR THE rc.httpd'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.httpd package. -# Miklos Vajna <[email protected]>, 2005. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.httpd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-10 18:24+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.httpd:17 -msgid "Apache web server" -msgstr "" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
