Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David C. Haley (69d38bf6f354e950805b364b07dabdc40b21fc1f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "David C. Haley" <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David C. Haley (69d38bf6f354e950805b364b07dabdc40b21fc1f)
  • Date: Tue, 25 Oct 2016 05:15:12 +0000

GIT changes to master grimoire by David C. Haley <khoralin AT gmail.com>:

ChangeLog | 1 +
http/apache1/BUILD | 14 +-------------
http/apache1/DETAILS | 12 +++---------
http/apache1/HISTORY | 4 ++++
http/apache1/INSTALL | 1 +
http/apache1/PRE_BUILD | 4 +---
http/apache1/UP_TRIGGERS | 2 ++
http/apache2/BUILD | 18 +-----------------
http/apache2/DETAILS | 13 +++----------
http/apache2/HISTORY | 6 ++++--
http/apache2/INSTALL | 4 +---
http/apache2/PRE_BUILD | 4 +---
http/apache2/UP_TRIGGERS | 2 ++
http/apache22/CONFLICTS | 4 ++--
14 files changed, 27 insertions(+), 62 deletions(-)

New commits:
commit 69d38bf6f354e950805b364b07dabdc40b21fc1f
Author: David C. Haley <khoralin AT gmail.com>
Commit: David C. Haley <khoralin AT gmail.com>

http/apache2: deprecated in favor of apache22

commit 4f27621076088debf9d0cf691540e687523210ce
Author: David C. Haley <khoralin AT gmail.com>
Commit: David C. Haley <khoralin AT gmail.com>

http/apache1: deprecated in favor of apache22

diff --git a/ChangeLog b/ChangeLog
index d5748f4..19f16e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2016-10-24 David C. Haley <khoralin AT gmail.com>
* tor.gpg: keyring refreshed with latest project/developer keys
+ * http/apache2: deprecated in favor of apache22

2016-10-23 Treeve Jelbert <treeve AT sourcemage.org>
* kde5-apps/krusader: added
diff --git a/http/apache1/BUILD b/http/apache1/BUILD
index 210aa41..27ba77d 100755
--- a/http/apache1/BUILD
+++ b/http/apache1/BUILD
@@ -1,13 +1 @@
-./configure --prefix=/usr \
- --sysconfdir=/etc/httpd \
- --localstatedir=/var \
- --logfiledir=/var/log/httpd \
- --proxycachedir=/var/cache/httpd \
- --runtimedir=/var/run/httpd \
- --enable-module=most \
- --enable-shared=max \
- --enable-module=mmap_static \
- --disable-module=auth_dbm \
- --with-layout=GNU \
- $OPTS &&
-make
+true
diff --git a/http/apache1/DETAILS b/http/apache1/DETAILS
index 4e1c3ff..7bb32c7 100755
--- a/http/apache1/DETAILS
+++ b/http/apache1/DETAILS
@@ -1,15 +1,9 @@
SPELL=apache1
VERSION=1.3.42
SECURITY_PATCH=4
- SOURCE=apache_$VERSION.tar.gz
- SOURCE2=$SOURCE.asc
- SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/apache_$VERSION
- SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
- SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
- SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2
- SOURCE2_URL[1]=http://www.apache.org/dist/httpd/$SOURCE2
- SOURCE2_IGNORE=signature
+ PATCHLEVEL=1
+ ARCHIVE=off
+ GATHER_DOCS=off
LICENSE[0]=APACHE
WEB_SITE=http://httpd.apache.org/
KEYWORDS="http"
diff --git a/http/apache1/HISTORY b/http/apache1/HISTORY
index b1480e5..78fb861 100644
--- a/http/apache1/HISTORY
+++ b/http/apache1/HISTORY
@@ -1,3 +1,7 @@
+2016-10-18 David C. Haley <khoralin AT gmail.com>
+ * ALL: deprecated. apache1 -> apache22
+ Upstream vendor deprecated 1.x branch for 2.2.x.
+
2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
* CONFLICTS: check spell_ok before persistent_read
correct conflicts to httpd-dev
diff --git a/http/apache1/INSTALL b/http/apache1/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/http/apache1/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/http/apache1/PRE_BUILD b/http/apache1/PRE_BUILD
index e44f89a..27ba77d 100755
--- a/http/apache1/PRE_BUILD
+++ b/http/apache1/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/apache_1.3.41_glic.patch
+true
diff --git a/http/apache1/UP_TRIGGERS b/http/apache1/UP_TRIGGERS
new file mode 100755
index 0000000..9af34f4
--- /dev/null
+++ b/http/apache1/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger apache1 dispel_self
+up_trigger apache22 cast_self
diff --git a/http/apache2/BUILD b/http/apache2/BUILD
index 57d9a73..27ba77d 100755
--- a/http/apache2/BUILD
+++ b/http/apache2/BUILD
@@ -1,17 +1 @@
-# remove APR and APU and reconfigure to use external ones
-rm -fr srclib/apr*/ &&
-
-# use smgl standard layout
-cp -f $SCRIPT_DIRECTORY/config.layout $SOURCE_DIRECTORY &&
-
-./buildconf --with-apr=/usr/share/apache2 \
- --with-apr-util=/usr/share/apache2 &&
-
-./configure --prefix=$INSTALL_ROOT/usr \
- --sysconfdir=$INSTALL_ROOT/etc/httpd \
- --localstatedir=$INSTALL_ROOT/var \
- --mandir=$INSTALL_ROOT/usr/share/man \
- --enable-layout=SMGL \
- --enable-modules=most \
- $OPTS $APACHE22_EXTRA &&
-make
+true
diff --git a/http/apache2/DETAILS b/http/apache2/DETAILS
index 5f7e6c7..d4bd1d2 100755
--- a/http/apache2/DETAILS
+++ b/http/apache2/DETAILS
@@ -1,16 +1,9 @@
SPELL=apache2
VERSION=2.0.63
- SOURCE=httpd-$VERSION.tar.gz
- SOURCE2=$SOURCE.asc
- SOURCE_GPG="apache.gpg:${SOURCE}.asc:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
- SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
- SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
- SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2
- SOURCE2_URL[1]=http://www.apache.org/dist/httpd/$SOURCE2
- SOURCE2_IGNORE=signature
SECURITY_PATCH=3
- PATCHLEVEL=0
+ PATCHLEVEL=1
+ ARCHIVE=off
+ GATHER_DOCS=off
LICENSE[0]=APACHE
KEYWORDS="http"
WEB_SITE=http://www.apache.org/
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index e2ef5dd..ebfab6f 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,6 +1,8 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2016-10-24 David C. Haley <khoralin AT gmail.com>
+ * DETAILS: deprecated in favor of apache22

+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL
* SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL

2010-08-18 Remko van der Vossen <wich AT sourcemage.org>
diff --git a/http/apache2/INSTALL b/http/apache2/INSTALL
index c05fea2..27ba77d 100755
--- a/http/apache2/INSTALL
+++ b/http/apache2/INSTALL
@@ -1,3 +1 @@
-default_install &&
-ln -sf $TRACK_ROOT/usr/sbin/envvars /usr/bin/envvars &&
-ln -sf $TRACK_ROOT/usr/sbin/httpd /usr/bin/httpd
+true
diff --git a/http/apache2/PRE_BUILD b/http/apache2/PRE_BUILD
index b69b7fe..27ba77d 100755
--- a/http/apache2/PRE_BUILD
+++ b/http/apache2/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/buildconf.patch
+true
diff --git a/http/apache2/UP_TRIGGERS b/http/apache2/UP_TRIGGERS
new file mode 100755
index 0000000..d7b536f
--- /dev/null
+++ b/http/apache2/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger apache2 dispel_self
+up_trigger apache22 cast_self
diff --git a/http/apache22/CONFLICTS b/http/apache22/CONFLICTS
index dced333..6e9e0a6 100755
--- a/http/apache22/CONFLICTS
+++ b/http/apache22/CONFLICTS
@@ -1,7 +1,7 @@
conflicts apache &&
conflicts apache-mod_ssl &&
-conflicts apache1 &&
-conflicts apache2 &&
+conflicts apache1 y &&
+conflicts apache2 y &&
conflicts httpd-dev &&
if spell_ok xshttpd; then
persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&



  • [SM-Commit] GIT changes to master grimoire by David C. Haley (69d38bf6f354e950805b364b07dabdc40b21fc1f), David C. Haley, 10/25/2016

Archive powered by MHonArc 2.6.24.

Top of Page