Adjusting spec file

diff --git a/Makefile b/Makefile
index 8a1e6af099158319e647eb829ecb7f395001bd48..69ac4af59c3d0a10b7db5befb75491ec97143b09 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -220,6 +220,7 @@ install     :
           @ install -d $(DESTDIR)/$(ETCDIR)/httpd/conf.d/
           @ install -d $(DESTDIR)/$(ETCDIR)/cron.d/
           @ install -d $(DESTDIR)/$(LIBDIR)/$(APPN)/
+          @ install -d $(DESTDIR)/$(LIBDIR)/$(APPN)/tools
           @ install -d $(DESTDIR)/$(EXECDIR)/$(APPN)/
           @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/mails
           @ install -d $(DESTDIR)/$(SPOOLDIR)/$(APPN)/queue
@@ -254,6 +255,9 @@ install     :
           @ cp -a                                      \
                sql                                     \
                $(DESTDIR)/$(DATADIR)/$(APPN)/
+          @ cp -a                                      \
+               tools/genpsdusr.sh                      \
+               $(DESTDIR)/$(LIBDIR)/$(APPN)/tools
           @ cp -a                                      \
                www/*                                   \
                $(DESTDIR)/var/www/$(APPN)/

diff --git a/Makefile.dist b/Makefile.dist
index 635282ce24485c9f1b50a4de6799d6bfde26c6ef..3fb9193d10eaf62ae7fed9bdb80802e9ab221fe4 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -30,7 +30,6 @@ tarfile       : clean
          @ mkdir -p                                            \
                $(APLV)/app                                     \
                $(APLV)/certs                                   \
-               $(APLV)/certs                                   \
                $(APLV)/conf                                    \
                $(APLV)/bin                                     \
                $(APLV)/lib                                     \
@@ -38,6 +37,7 @@ tarfile       : clean
                $(APLV)/shell                                   \
                $(APLV)/sysconfig                               \
                $(APLV)/support                                 \
+               $(APLV)/sql                                     \
                $(APLV)/tools                                   \
                $(APLV)/www                                     \
                $(APLV)
@@ -68,8 +68,11 @@ tarfile      : clean
                $(APLV)/support
          @ cp -a sysconfig/*                                   \
                $(APLV)/sysconfig
-         @ cp -a sql/                                          \
-               $(APLV)/
+         @ cp -a                                               \
+               sql/$(APPN).sql                                 \
+               sql/datatest.*                                  \
+               sql/Makefile                                    \
+               $(APLV)/sql
          @ cp -a app/Makefile  $(APLV)/app/Makefile
          @ cp -a lib/Makefile  $(APLV)/lib/Makefile
          @ tar zcf $(SRC)/$(APLV).tar.gz $(APLV)

diff --git a/lib/lvleml.c b/lib/lvleml.c
index 70041506783a7fdfffe8f8f7fcfa95ff158eab11..ea0937b7614519df719e9d07a28ebaf38032a65c 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -2846,11 +2846,11 @@ if ((contact!=(CONTYP *)0)&&(contact->recipients!=(RCPTYP **)0)) {
     tra->rcptto=strdup(data);
     (void) strcpy(data,"email header, 'From:' missing");
     if (contact->session->hfrom!=(char *)0) 
-      (void) strncpy(data,contact->session->hfrom,sizeof(data));
+      (void) strncpy(data,contact->session->hfrom,sizeof(data)-1);
     tra->hfrom=strdup(data);
     (void) strcpy(data,"email header, 'Subject:' missing");
     if (contact->session->hsubject!=(char *)0) 
-      (void) strncpy(data,contact->session->hsubject,sizeof(data));
+      (void) strncpy(data,contact->session->hsubject,sizeof(data)-1);
     tra->hsubject=strdup(data);
     tralist=(TRATYP **)rou_addlist((void **)tralist,(void *)tra);
     ptr++;

diff --git a/mailleur.spec.in b/mailleur.spec.in
index 299d844324d8beae9b1e991d654f66021a4cf976..33664b02967ed579aa588dd3081132fcddaad039 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -62,6 +62,7 @@ search about email exchange within time and transaction context.
 %attr(0640,%{name},dovecot) %config(noreplace) %{dovedir}/passfile
 %{_libexecdir}/%{name}/bin-utils/chkspf
 %{_libexecdir}/%{name}/bin-utils/feeder
+%{_libdir}/%{name}/rpm_build_date
 %attr(0754,root,root) %{_libdir}/%{name}/shell/*.sh
 %attr(0754,root,root) %{_libdir}/%{name}/support/addconfig.sh
 %attr(0754,root,root) %{_libdir}/%{name}/support/do_database.sh
@@ -78,16 +79,17 @@ search about email exchange within time and transaction context.
 %{wwwdir}/%{name}/index.php
 %attr(0750,%{name},apache) %{wwwdir}/%{name}/lvlmai.php
 %attr(0750,%{name},apache) %{wwwdir}/%{name}/devsql.php
+%attr(0750,%{name},apache) %{wwwdir}/%{name}/gesdis.php
 %attr(0750,%{name},apache) %{wwwdir}/%{name}/gessql.php
 %attr(0750,%{name},apache) %{wwwdir}/%{name}/lvllog.php
+%attr(0750,%{name},apache) %{wwwdir}/%{name}/lvlusr.php
 %attr(0750,%{name},apache) %{wwwdir}/%{name}/release.php
-%attr(0750,%{name},apache) %{wwwdir}/%{name}/unidis.php
 %attr(0750,%{name},apache) %{wwwdir}/%{name}/unienv.php
+%attr(0750,%{name},apache) %{wwwdir}/%{name}/unilng.php
 %attr(0750,%{name},apache) %{wwwdir}/%{name}/subrou.php
 %attr(0640,%{name},apache) %{wwwdir}/%{name}/reg-icons/*.gif
-%attr(0640,root,root) %{_datadir}/%{name}/sql/Makefile
-%attr(0644,root,root) %{_datadir}/%{name}/sql/datatest.def
-%attr(0644,root,root) %{_datadir}/%{name}/sql/*.sql
+%attr(0640,%{name},apache) %{wwwdir}/%{name}/reg-icons/*.png
+%attr(0644,root,root) %{_datadir}/%{name}/sql/%{name}.sql
 %exclude %{_datadir}/%{name}/sql/%{name}.mysql
 %exclude %{_datadir}/%{name}/sql/%{name}.postg
 #-----------------------------------------------------------------------------
@@ -169,6 +171,27 @@ if [ "$1" = 1 ]; then
     esac
   fi
 
+#=============================================================================
+%package               devel
+Summary                :       tools and components to test '%{name}'
+
+#-----------------------------------------------------------------------------
+
+Requires       :       %{name}                 =  %{version}-%{release}
+Requires       :       gdb
+
+#-----------------------------------------------------------------------------
+%description           devel
+'%{name}' tools and data set to improve/debug '%{name}'
+
+#-----------------------------------------------------------------------------
+%files                 devel
+%defattr(-,root,root,-)
+%attr(0750,root,root) %{_libdir}/%{name}/tools/genpsdusr.sh
+%attr(0640,root,root) %{_datadir}/%{name}/sql/datatest.sql
+%attr(0640,root,root) %{_datadir}/%{name}/sql/Makefile
+%attr(0644,root,root) %{_datadir}/%{name}/sql/datatest.def
+
 #=============================================================================
 %package               postgresql
 Summary                :       mailleur using postgresql as Data-base
@@ -332,5 +355,7 @@ if [ "$1" = 0 ]; then
         DESTDIR="%{buildroot}"         \
         install
 
+date   > %{buildroot}%{_libdir}/%{name}/rpm_build_date
+
 #=============================================================================
 %changelog