www-apache/mod_ruid2: Use upstream URL, add patch for Makefile

Package-Manager: portage-2.2.7

4 files changed, 228 insertions, 4 deletions

diff --git a/www-apache/mod_ruid2/ChangeLog b/www-apache/mod_ruid2/ChangeLog
index 7d736e24..4a6a2406 100644
--- a/www-apache/mod_ruid2/ChangeLog
+++ b/www-apache/mod_ruid2/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Nov 2013; Bertrand Jacquin <beber@meleeweb.net> +files/9999-Makefile.patch,
+  mod_ruid2-9999.ebuild:
+  www-apache/mod_ruid2: Use upstream URL, add patch for Makefile
+
 *mod_ruid2-0.9.8 (27 Nov 2013)
 
   27 Nov 2013; Bertrand Jacquin <beber@meleeweb.net>
diff --git a/www-apache/mod_ruid2/Manifest b/www-apache/mod_ruid2/Manifest
index 927c6a19..494f7c68 100644
--- a/www-apache/mod_ruid2/Manifest
+++ b/www-apache/mod_ruid2/Manifest
@@ -1,6 +1,7 @@
 AUX 0.9.8-Makefile.patch 4716 SHA256 755c7aeec21bf7eba8fd8bcadee091b24acf0c52288c533a63ba594535bf0dc9 WHIRLPOOL 1a7d9bcf2a9e76daa7fbd2f7673c061cf0200987583d1f61485c2f0effc78c28772c9a76f059f467aa0acadcbc09b7124e5433488f4f02f3da81d219aa190286
+AUX 9999-Makefile.patch 4752 SHA256 31e9ead1367bd92ac4f6fc6629aa75c2229bdbcde670265f6c0b809fa348d516 WHIRLPOOL 0abcbab7ed967b3bddd35b3abd23d68034145e2db7f60a6aad06127cc06cc962d7a943248bdf439d2685cb7f57d904bddb9483406f38ae5cc9a4787847828a95
 DIST mod_ruid2-0.9.8.tar.gz 16383 SHA256 7db4e2c5edc2db1aaef20ddde11e695911d7ffb818e382989d0db39900d440d4 WHIRLPOOL d22c0f2aa9d708651f841c8c8597f74d31b168bf4f8612d429edc2539b1456ef1d35c96db15dfc377e9627aa290f51d9d41067d95f752c50e4c1ead139d4d943
 EBUILD mod_ruid2-0.9.8.ebuild 700 SHA256 292df25e74b0e153f4cc682c0fd384d458c2069695a28a39f1d10b6357535862 WHIRLPOOL 67560b28d5ee6a0d916443cdede1d75802aaa608873b2bf05c4822485ad80e05e8375ef72beeb054d93b282e174d0a2e7e2a37e5f9aaaca2937b30ef4aca0d3c
-EBUILD mod_ruid2-9999.ebuild 601 SHA256 d9680a6aee25190c32097cb8b0524092d0cc7f9092cad5afc92a5fc3179a9363 WHIRLPOOL 28274e4aae270589770e8153e32eb011fef5288c3646be105361a86c3b4baa04ed8e5bf80b79114d2701df19d1306378331efa2dadbf0fb5b43205ac59b160c3
-MISC ChangeLog 1511 SHA256 99905f5bf3895778f58ea60b7d3ac684b7bc00ba728a7b994e69983d1062a970 WHIRLPOOL 7a47e6dc8a6af09eea0f14ba5ee97886398b47787f790973b11e5e2ac771190231bee8fb73a14730b1b7fde488ca5936d8d70a911f7b3826f7303de19d2ddd93
+EBUILD mod_ruid2-9999.ebuild 666 SHA256 e3dcff8ec7d25d78e7a57badeed5d005568f65678e991d2448a199725befa93c WHIRLPOOL e9a18d8c472e891dda837ad8a631798bd8b7f941ee49c8b24133a702a749e499ab86c98597217f8a07e89682c96d9353338f6d09a74d0c7404b644aca43a1360
+MISC ChangeLog 1683 SHA256 7fdc4c0121ed52003cee785b16e3246f3d453b0244a9ea8c8dd2db1aa18f64f6 WHIRLPOOL af723cb18e0929acfc10411e17fcf11a393e879b5f67adadbe7cc0aa462030b42b71b375d14e167aa95fac1e87992d3cb2b05dc19fbd76d834d5b6476a1a0b37
 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/www-apache/mod_ruid2/files/9999-Makefile.patch b/www-apache/mod_ruid2/files/9999-Makefile.patch
new file mode 100644
index 00000000..d95005f2
--- /dev/null
+++ b/www-apache/mod_ruid2/files/9999-Makefile.patch
@@ -0,0 +1,215 @@
+From bdf2787529a18f9c9090335011e232eeb0bc616d Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <beber@meleeweb.net>
+Date: Wed, 19 Dec 2012 15:01:45 +0100
+Subject: [PATCH] Add a proper Makefile to build project.
+
+Inspired from mod_virtualvalue
+
+Also, don't make reference to any version in code or elsewhere, this now
+come from git describe and CFLAGS definition
+
+Build the project (one of) :
+ $ make
+ $ make shared
+ $ make all
+  CC     mod_ruid2.o
+  CC     mod_ruid2.so
+
+Build with verbose output :
+ $ make V=1
+cc -c -DMODULE_NAME='"mod_ruid2"' -DMODULE_VERSION='"v0.9.8-6-g20ec6cc-dev"' -fPIC -I/usr/include/apache2 -D_REENTRANT -D_GNU_SOURCE -pthread -I/usr/include/apr-1   -W -Wall -o mod_ruid2.o mod_ruid2.c
+ld -shared -o mod_ruid2.so mod_ruid2.o  -lapr-1 -luuid -lrt -lcrypt -lpthread -ldl  -lcap
+
+Build with specific CFLAGS and CC :
+ $ make CC=i586-pc-linux-gnu-gcc CFLAGS='-march=geode -Os -mmmx -m3dnow -I/data/cross/alix3-i586/firmware/usr/include'
+
+In this case default one (-fPIC is alway applied).
+
+Strip library :
+ $ make strip
+  STRIP  mod_ruid2.so
+
+Build a tar for public release :
+ $ make dist
+  TAR    mod_ruid2-v0.9.8-6-g20ec6cc-dev.tar
+  XZ     mod_ruid2-v0.9.8-6-g20ec6cc-dev.txz
+---
+ Makefile    | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ mod_ruid2.c |   8 +---
+ 2 files changed, 135 insertions(+), 7 deletions(-)
+ create mode 100644 Makefile
+
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..98413a6
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,134 @@
++#!/usr/bin/make -f <
++#
++# Copyright (C) 2013 Bertrand Jacquin <beber@meleeweb.net>
++
++NAME	= mod_ruid2
++VERSION = $(shell git describe --tags --dirty=-dev 2> /dev/null)
++
++SRC	= \
++	mod_ruid2.c
++
++DOC_FILES	= \
++	README \
++	ruid2.conf
++
++EXTRA_FILES	= \
++	LICENSE \
++	Makefile
++
++PKG_CONFIG	?= pkg-config
++
++APR_CFLAGS	= \
++	$(shell $(PKG_CONFIG) --cflags apr-1)
++
++APR_LDFLAGS	= \
++	$(shell $(PKG_CONFIG) --libs apr-1)
++
++HTTPD_CFLAGS	= \
++	-I/usr/include/apache2
++
++CAP_LDFLAGS	= \
++	-lcap
++
++CFLAGS	?= \
++	-W -Wall
++
++SPEC_CFLAGS	= \
++	-DMODULE_NAME='"$(NAME)"'	\
++	-DMODULE_VERSION='"$(VERSION)"'	\
++	-fPIC \
++	$(HTTPD_CFLAGS) \
++	$(APR_CFLAGS) \
++	$(CAP_CFLAGS)
++
++SPEC_LDFLAGS	= \
++	$(HTTPD_LDFLAGS) \
++	$(APR_LDFLAGS) \
++	$(CAP_LDFLAGS)
++
++ifdef DEBUG
++SPEC_CFLAGS +=\
++	-DDEBUG \
++	-g -ggdb
++endif # DEBUG
++
++CC	?= cc
++
++STRIP	?= strip
++STRIP_FLAGS	?= --strip-unneeded -R .comment -R .GCC.command.line -R .note.gnu.build-id
++
++INSTALL	?= install
++
++RM	?= rm -f
++
++TAR	= tar
++XZ	= xz
++
++DESTDIR	?=
++PREFIX	?= /usr/local
++MODDIR	?= $(PREFIX)/lib/apache2/modules
++DOCDIR	?= $(PREFIX)/share/doc/$(NAME)
++
++ifeq ($(V),)
++ Q		= @
++
++ quiet_cmd	= @printf "  %-6s %s\n" "$(1)" "$(2)";
++endif	# $(V)
++
++all:	shared
++
++shared:	$(NAME).so
++dist:	$(NAME)-$(VERSION).txz
++
++# Build rules
++%.o:	%.c
++	$(call quiet_cmd,CC,$@)
++	$(Q)$(CC) -c $(SPEC_CFLAGS) $(CFLAGS) -o $@ $<
++
++$(NAME).so:	$(SRC:c=o)
++	$(call quiet_cmd,CC,$@)
++	$(Q)$(CC) -shared -o $@ $^ $(SPEC_LDFLAGS) $(LDFLAGS)
++
++strip:	$(NAME).so
++	$(call quiet_cmd,STRIP,$<)
++	$(Q)$(STRIP) $(STRIP_FLAGS) $<
++
++# Archiving rules
++$(NAME)-$(VERSION).tar:	$(SRC) $(EXTRA_FILES) $(DOC_FILES)
++	$(call quiet_cmd,TAR,$@)
++	$(Q)$(TAR) cf $@ \
++		--transform "s,^,$(NAME)-$(VERSION)/," \
++		--force-local --numeric-owner \
++		$^
++
++%.txz: 	%.tar
++	$(call quiet_cmd,XZ,$@)
++	$(Q)$(XZ) -c > $@ < $<
++
++# Install rules
++install:	\
++	$(DESTDIR)$(MODDIR)/$(NAME).so \
++	$(addprefix $(DESTDIR)$(DOCDIR)/,$(DOC_FILES))
++
++$(DESTDIR)$(MODDIR)/$(NAME).so:	$(NAME).so
++	$(call quiet_cmd,INSTALL,$@)
++	$(Q)$(INSTALL) -D -m 444 $< $@
++
++$(DESTDIR)$(DOCDIR)/%:	%
++	$(call quiet_cmd,INSTALL,$@)
++	$(Q)$(INSTALL) -D -m 444 $< $@
++
++# Cleanup rules
++clean:
++	$(call quiet_cmd,RM,$(SRC:c=o))
++	$(Q)$(RM) $(SRC:c=o)
++	$(call quiet_cmd,RM,$(NAME).so)
++	$(Q)$(RM) $(NAME).so
++
++distclean: clean
++	$(call quiet_cmd,RM,$(NAME)-$(VERSION).tar)
++	$(Q)$(RM) $(NAME)-$(VERSION).tar
++	$(call quiet_cmd,RM,$(NAME)-$(VERSION).txz)
++	$(Q)$(RM) $(NAME)-$(VERSION).txz
++
++.PHONY:	strip
+diff --git a/mod_ruid2.c b/mod_ruid2.c
+index 30d81b2..96f7bcb 100644
+--- a/mod_ruid2.c
++++ b/mod_ruid2.c
+@@ -1,5 +1,5 @@
+ /*
+-   mod_ruid2 0.9.8
++   mod_ruid2
+    Copyright (C) 2009-2013 Monshouwer Internet Diensten
+ 
+    Author: Kees Monshouwer
+@@ -22,9 +22,6 @@
+    - mod_ruid - http://websupport.sk/~stanojr/projects/mod_ruid/
+      Copyright 2004 by Pavel Stano. All rights reserved
+ 
+-   Instalation:
+-   - /usr/apache/bin/apxs -a -i -l cap -c mod_ruid2.c
+-
+    Issues:
+    - https://github.com/mind04/mod-ruid2/issues
+ */
+@@ -50,9 +47,6 @@
+ #include <sys/prctl.h>
+ #include <sys/capability.h>
+ 
+-#define MODULE_NAME		"mod_ruid2"
+-#define MODULE_VERSION		"0.9.8"
+-
+ #define RUID_MIN_UID		100
+ #define RUID_MIN_GID		100
+ 
+-- 
+1.8.4.4
+
diff --git a/www-apache/mod_ruid2/mod_ruid2-9999.ebuild b/www-apache/mod_ruid2/mod_ruid2-9999.ebuild
index 170f5675..5edf93ea 100644
--- a/www-apache/mod_ruid2/mod_ruid2-9999.ebuild
+++ b/www-apache/mod_ruid2/mod_ruid2-9999.ebuild
@@ -3,11 +3,11 @@
 # $Header: $
 
 EAPI=5
-inherit apache-module toolchain-funcs confutils git-2
+inherit apache-module eutils toolchain-funcs confutils git-2
 
 DESCRIPTION="suexec module for apache, based on mod_ruid and mod_suid2"
 HOMEPAGE="https://github.com/mind04/mod-ruid2"
-EGIT_REPO_URI="git://git.meleeweb.net/var/git/mod_ruid.git"
+EGIT_REPO_URI="https://github.com/mind04/mod-ruid2.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -23,6 +23,10 @@ DOCFILES="README ruid2.conf"
 
 need_apache2
 
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-Makefile.patch"
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)"
 }