diff --git a/piler.spec b/piler.spec index 1744783..cd5edef 100644 --- a/piler.spec +++ b/piler.spec @@ -1,6 +1,6 @@ %define name piler %define version 0.1.25 -%define release 1 +%define release 2 Summary: an email archiving application Name: %{name} @@ -21,16 +21,15 @@ %setup %build -./configure --localstatedir=/var --enable-starttls --enable-tcpwrappers --with-database=mariadb +./configure --localstatedir=/var --enable-starttls --enable-tcpwrappers --with-database=mysql make clean all %install ##mkdir -p /tmp/aa/etc/init.d ##make install DESTDIR=/tmp/aa -mkdir -p /root/rpmbuild/BUILDROOT/piler-0.1.25-1.x86_64/etc/init.d -mkdir -p /root/rpmbuild/BUILDROOT/piler-0.1.25-1.x86_64/usr/local/lib -make install DESTDIR=/root/rpmbuild/BUILDROOT/piler-0.1.25-1.x86_64 -cp /usr/local/lib/libmariadb* /root/rpmbuild/BUILDROOT/piler-0.1.25-1.x86_64/usr/local/lib +mkdir -p /root/rpmbuild/BUILDROOT/piler-0.1.25-2.x86_64/etc/init.d +mkdir -p /root/rpmbuild/BUILDROOT/piler-0.1.25-2.x86_64/usr/local/lib +make install DESTDIR=/root/rpmbuild/BUILDROOT/piler-0.1.25-2.x86_64 %files @@ -55,9 +54,6 @@ /usr/local/sbin/piler /usr/local/sbin/pilergetd /usr/local/sbin/pilerconf -/usr/local/lib/libmariadbclient.a -/usr/local/lib/libmariadb.so -/usr/local/lib/libmariadb.so.1 /usr/local/lib/libpiler.a /usr/local/lib/libpiler.so /usr/local/lib/libpiler.so.0 @@ -94,6 +90,9 @@ %changelog +* Fri Nov 1 2013 Janos Suto + - Fixed a bug causing issues when reading the retention|archiving_rules tables + * Fri Oct 25 2013 Janos Suto - First release of the rpm package based on build 846 diff --git a/util/postinstall.sh.in b/util/postinstall.sh.in index 276ea6e..25d40e2 100755 --- a/util/postinstall.sh.in +++ b/util/postinstall.sh.in @@ -109,6 +109,16 @@ } +askNoEcho() { + PROMPT=$1 + DEFAULT=$2 + + stty -echo + ask "$PROMPT" "$DEFAULT" + stty echo + echo "" +} + askNonBlankNoEcho() { PROMPT=$1 DEFAULT=$2 @@ -204,7 +214,7 @@ askNonBlank "Please enter mysql user name" "$MYSQL_USERNAME" MYSQL_USERNAME=$response - askNonBlankNoEcho "Please enter mysql password for $MYSQL_USERNAME" "" + askNoEcho "Please enter mysql password for $MYSQL_USERNAME" "" MYSQL_PASSWORD=$response askNonBlankNoEcho "Please enter mysql root password" ""