[axmail] New version

Mon Feb 16 15:45:09 UTC 2015

commit 3156935165d759fa3c057da1b7bc9348e4a56d4e
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Feb 16 16:44:59 2015 +0100

    New version
    
    - Rebased install-fix and build-fix patches
    - Dropped setgroups patch (upstreamed)

 .gitignore                     |    1 +
 axmail-2.0-build-fix.patch     |   13 ---------
 axmail-2.0-install-fix.patch   |   40 -----------------------------
 axmail-2.3.1-build-fix.patch   |   22 ++++++++++++++++
 axmail-2.3.1-install-fix.patch |   55 ++++++++++++++++++++++++++++++++++++++++
 axmail.spec                    |   13 ++++++---
 sources                        |    2 +-
 7 files changed, 87 insertions(+), 59 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 19f07b6..6bfcc60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /axmail-2.0.tar.gz
+/axmail-2.3.1.tar.gz
diff --git a/axmail-2.3.1-build-fix.patch b/axmail-2.3.1-build-fix.patch
new file mode 100644
index 0000000..811ccb9
--- /dev/null
+++ b/axmail-2.3.1-build-fix.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index e362764..885a7d6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@ all: axmail
+ CC = gcc
+ LD = gcc
+ CFLAGS = -static -Wstrict-prototypes -g -I../lib
+-LDFLAGS = -lcrypt
++LIBS = -lcrypt
+ MODULES = utils.o config.o adduser.o command.o mailcmd.o mbox.o head.o lock.o axmail.o quit.o
+ 
+ .c.o:
+@@ -35,7 +35,7 @@ distclean: clean
+ 	rm -f axmail
+ 
+ axmail: $(MODULES)
+-	$(LD) -o axmail $(MODULES) $(LDFLAGS)
++	$(LD) -o axmail $(MODULES) $(LIBS) $(LDFLAGS)
+ 
+ utils.o:	utils.h utils.c mbox.h
+ config.o:	config.h config.c defines.h axmail.h utils.h
diff --git a/axmail-2.3.1-install-fix.patch b/axmail-2.3.1-install-fix.patch
new file mode 100644
index 0000000..a513913
--- /dev/null
+++ b/axmail-2.3.1-install-fix.patch
@@ -0,0 +1,55 @@
+diff --git a/Makefile b/Makefile
+index ab747c8..f0a14ae 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,16 +12,16 @@ MODULES = utils.o config.o adduser.o command.o mailcmd.o mbox.o head.o lock.o ax
+ install: installbin installconf installhelp
+ 
+ installbin: all
+-	install -m 0755 -s -o root -g root axmail	 /usr/local/sbin
++	install -m 0755 -p -D axmail	 $(DESTDIR)/usr/sbin/axmail
+ 
+ installconf:
+-	install -m 755    -o root -g root -d		/usr/local/etc/ax25
+-	install -m 644    -o root -g root etc/axmail.conf /usr/local/etc/ax25
+-	install -m 644    -o root -g root etc/welcome.txt /usr/local/etc/ax25
++	install -m 755    -D -d		  $(DESTDIR)/etc/ax25
++	install -m 644    -p etc/axmail.conf $(DESTDIR)/etc/ax25
++	install -m 644    -p etc/welcome.txt $(DESTDIR)/etc/ax25
+ 
+ installhelp:
+-	install -m 755    -o root -g root -d		  /usr/local/var/ax25/axmail/help
+-	install -m 644    -o root -g root etc/help/*.hlp  /usr/local/var/ax25/axmail/help
++	install -m 755    -D -d		  $(DESTDIR)/usr/share/axmail/help
++	install -m 644    -p etc/help/*.hlp  $(DESTDIR)/usr/share/axmail/help
+ 
+ back:
+ 	rm -f ../mail.tar.gz
+diff --git a/defines.h b/defines.h
+index 7a5daff..51cf1f7 100644
+--- a/defines.h
++++ b/defines.h
+@@ -7,18 +7,18 @@
+ #define COPYRIGHT "(c) 1996, 1998 Heikki Hannikainen (OH7LZB) <hessu at hes.iki.fi>\nMailbox save support (c) 2003 Marius Petrescu (YO2LOJ) <mpetrescu at online.ro>\nOther modifications (c) 2005, 2006, 2015 by Brian Rogers (N1URO) <n1uro at n1uro.net> "
+ #define PROMPT "=> "
+ 
+-#define CONF_AXMAIL_FILE "/usr/local/etc/ax25/axmail.conf"
+-#define CONF_AXMAIL_PROF_FILE "/usr/local/etc/ax25/ax25.profile"
++#define CONF_AXMAIL_FILE "/etc/ax25/axmail.conf"
++#define CONF_AXMAIL_PROF_FILE "/etc/ax25/ax25.profile"
+ #define CONF_AXMAIL_USER_FILE ".axmailrc"
+-#define DATA_AXMAIL_HELP_DIR "/usr/local/var/ax25/axmail/help/"
+-#define DATA_AXMAIL_MAIL_DIR "/usr/local/var/spool/mail/"
++#define DATA_AXMAIL_HELP_DIR "/usr/share/axmail/help/"
++#define DATA_AXMAIL_MAIL_DIR "/var/spool/mail/"
+ #define LOCK_AXMAIL_FILE "/var/lock/axmail"
+ #define BIN_AXMAIL_SENDMAIL "/usr/sbin/sendmail"
+ 
+ #define USERPROFILE ".profile"
+ #define PASSWDFILE "/etc/passwd"
+ 
+-#define WELCOME "/usr/local/etc/ax25/welcome.txt"
++#define WELCOME "/etc/ax25/welcome.txt"
+ 
+ #define PATHSIZE 1024
+ #define LINESIZE 1024	/* Maximum length of a line in a message */
diff --git a/axmail.spec b/axmail.spec
index 2a7c5fb..a50290b 100644
--- a/axmail.spec
+++ b/axmail.spec
@@ -1,16 +1,15 @@
 Summary: UROnode addon - an SMTP mailbox
 Name: axmail
-Version: 2.0
+Version: 2.3.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Communications
 URL: http://www.n1uro.net
 Source0: ftp://ftp.n1uro.net/packet/%{name}-%{version}.tar.gz
 Source1: axmail-README.fedora
-Patch0: axmail-2.0-install-fix.patch
-Patch1: axmail-2.0-build-fix.patch
+Patch0: axmail-2.3.1-install-fix.patch
+Patch1: axmail-2.3.1-build-fix.patch
 Patch2: axmail-2.0-welcome-rename.patch
-Patch3: axmail-2.0-setgroups.patch
 # http://fedorahosted.org/fpc/ticket/447
 Provides: bundled(mailx) = 5.3b
 
@@ -26,7 +25,6 @@ for the SysOp.
 %patch0 -p1 -b .install-fix
 %patch1 -p1 -b .build-fix
 %patch2 -p1 -b .welcome-rename
-%patch3 -p1 -b .setgroups
 
 # Copy Fedora readme into place
 cp -p %{SOURCE1} README.fedora
@@ -59,5 +57,10 @@ touch %{buildroot}%{_var}/lock/axmail
 %ghost %{_var}/lock/axmail
 
 %changelog
+* Mon Feb 16 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 2.3.1-1
+- New version
+- Rebased install-fix and build-fix patches
+- Dropped setgroups patch (upstreamed)
+
 * Fri Jul 18 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 2.0-1
 - Initial release
diff --git a/sources b/sources
index 403f8ba..9d45544 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53ff603298ca8517cc343997df1a6c52  axmail-2.0.tar.gz
+c900abf2c2d4c00eb3500ac8193e9f5e  axmail-2.3.1.tar.gz
