diff options
author | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2014-11-21 21:38:56 +0100 |
---|---|---|
committer | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2014-11-21 21:38:56 +0100 |
commit | 129f727e7b6215c88e623d31156e2c31346ecb21 (patch) | |
tree | f9b2bebcdc8ed385d81305d7b5fb2b46f8b1c1f1 /testing/prayer/buildfix.patch | |
parent | f55b3f371ed9c97416ff3257d7d1ac6251ad0c00 (diff) | |
download | aports-129f727e7b6215c88e623d31156e2c31346ecb21.tar.bz2 aports-129f727e7b6215c88e623d31156e2c31346ecb21.tar.xz |
testing/prayer: new aport
Diffstat (limited to 'testing/prayer/buildfix.patch')
-rw-r--r-- | testing/prayer/buildfix.patch | 138 |
1 files changed, 138 insertions, 0 deletions
diff --git a/testing/prayer/buildfix.patch b/testing/prayer/buildfix.patch new file mode 100644 index 0000000000..66d525873a --- /dev/null +++ b/testing/prayer/buildfix.patch @@ -0,0 +1,138 @@ +diff --git a/Config b/Config +index 54044b7..48da020 100644 +--- a/Config ++++ b/Config +@@ -10,7 +10,7 @@ + SSL_ENABLE = true # SSL requires OpenSSL + SESSION_CACHE_ENABLE = true # SSL session cache Requires Berkeley DB 3 or 4 + GZIP_ENABLE = true # Enable on the fly compression of pages +-LDAP_ENABLE = true # Add LDAP interface ++LDAP_ENABLE = false # Add LDAP interface + FENCE_ENABLE = false # Use Electric Fence to catch malloc problems + MUTEX_SEMAPHORE = false # Use SYSV mutexes rather than file locking + TIDY_ENABLE = true # Use libtidy for HTML sanitisation. +@@ -30,7 +30,7 @@ ACCOUNTD_PAM_ENABLE = true # Enable PAM support in account management daemon + # Location of compiler + CC = gcc + # Location of make program (GNU make required) +-MAKE = gmake ++MAKE = make + # Location of install program (GNU install or compatible required) + INSTALL = install + +@@ -72,21 +72,21 @@ BASE_LIBS = -lcrypt -lutil + # which points to ../../imap/c-client. This just reduces the amount of + # noise output on each line when building the package. + # +-CCLIENT_DIR=../c-client +-CCLIENT_INCLUDE=-I $(CCLIENT_DIR) +-CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a ++#CCLIENT_DIR=../c-client ++#CCLIENT_INCLUDE=-I $(CCLIENT_DIR) ++#CCLIENT_LIBS=./$(CCLIENT_DIR)/c-client.a + + # + # Following works with imap-devel RPM package from Redhat 7. + # +-#CCLIENT_INCLUDE = -I/usr/include/imap +-#CCLIENT_LIBS = -lc-client ++CCLIENT_INCLUDE = -I/usr/include/imap ++CCLIENT_LIBS = -lc-client + # + # Complication: + # The Redhat RPM package links against SSL, PAM and kerberos libraries. + # +-#CCLIENT_SSL_ENABLE = true +-#CCLIENT_PAM_ENABLE = true ++CCLIENT_SSL_ENABLE = true ++CCLIENT_PAM_ENABLE = true + #CCLIENT_KERB_ENABLE = true + + # +@@ -162,20 +162,19 @@ DB_LIBS=-ldb + # RW_GROUP. It is important that nothing else can read the certificate file. + + # Build root (used by Redhat RPM system) +-BROOT= ++#BROOT= + + # Directory, User and group for read-write files: log files, sockets etc + VAR_PREFIX = /var/spool/prayer +-RW_USER = prayer +-RW_GROUP = prayer ++RW_USER = root ++RW_GROUP = root + + # Root Directory, User and group for read-only configuration files. + # Default configuration and permissions does not allow prayer user to + # update prayer configuration file. + +-PREFIX = /usr/local/prayer + RO_USER = root +-RO_GROUP = prayer ++RO_GROUP = root + + # Access permissions for general objects (wrt above users and groups) + PUBLIC_EXEC = 0755 +@@ -188,6 +187,6 @@ PRIVATE_DIR = 0750 + PRIVATE_FILE = 0640 + + # Location of configuration files and binaries +-PRAYER_CONFIG_FILE = ${PREFIX}/etc/prayer.cf +-BIN_DIR = ${PREFIX}/sbin +-ACCOUNTD_CONFIG_FILE = ${PREFIX}/etc/prayer-accountd.cf ++PRAYER_CONFIG_FILE = /etc/prayer.cf ++BIN_DIR = /usr/sbin ++ACCOUNTD_CONFIG_FILE = /etc/prayer-accountd.cf +diff --git a/session/mm.c b/session/mm.c +index 19b6fbd..d080eb3 100644 +--- a/session/mm.c ++++ b/session/mm.c +@@ -31,7 +31,7 @@ static void + /* Must call mminit before any other fn */ + void mm_init() + { +-#include "linkage.c" ++#include <imap/linkage.h> + + ml_init(); + } +diff --git a/templates/cam/Makefile b/templates/cam/Makefile +index 9f4122a..ff95283 100644 +--- a/templates/cam/Makefile ++++ b/templates/cam/Makefile +@@ -7,7 +7,7 @@ include ../../Config + endif + + CFLAGS = $(BASECFLAGS) +-LDFLAGS = $(BASELDFLAGS) ++LDFLAGS := $(BASELDFLAGS) + + TYPE=cam + +diff --git a/templates/old/Makefile b/templates/old/Makefile +index 31016cf..cf8738a 100644 +--- a/templates/old/Makefile ++++ b/templates/old/Makefile +@@ -7,7 +7,7 @@ include ../../Config + endif + + CFLAGS = $(BASECFLAGS) +-LDFLAGS = $(BASELDFLAGS) ++LDFLAGS := $(BASELDFLAGS) + + TYPE=old + +diff --git a/templates/src/Makefile b/templates/src/Makefile +index 5348a14..26cf2f1 100644 +--- a/templates/src/Makefile ++++ b/templates/src/Makefile +@@ -7,7 +7,7 @@ include ../../Config + endif + + CFLAGS = $(BASECFLAGS) +-LDFLAGS = $(BASELDFLAGS) ++LDFLAGS := $(BASELDFLAGS) + + LIB= ../../lib/lib_nossl.a + |