take a look at
https://github.com/rsyslog/rsyslog-pkg-ubuntu
to build locally without using the PPA infrastructure I apply the attached patch
(remove the sections for disabling usertools, that's a debugging thing I have in
place at the moment)
do pbuilder --create to create the compile environment, then I use the following
script to pull the latest updates and compile test packages
find . -name .git |sed s/.git// |while read file
do
echo "$file"
cd $file
/usr/bin/git fetch
/usr/bin/git pull
/usr/bin/git fetch --tags
# /usr/bin/git gc -q --aggressive
autoreconf -fi
./configure -q
rm *master*
make dist --quiet
cd -
done
echo "finished making source packages"
cd rsyslog-pkg-ubuntu
rm */LAST_VERSION.*
for i in libestr liblogging liblognorm librelp rsyslog
do
cd $i
rm ${i}_*
cp ../../$i/*master* .
../scripts/auto_daily_project.sh trusty v8-devel master
(
echo '1'
echo '1'
echo '1'
echo '1'
) |../scripts/build.sh
echo "finished making $i"
cd -
done
This should help get you started :-)
David Lang
On Wed, 3 Jun 2015, Brian Knox wrote:
Date: Wed, 3 Jun 2015 11:48:20 -0400
From: Brian Knox <[email protected]>
Reply-To: rsyslog-users <[email protected]>
To: rsyslog-users <[email protected]>
Subject: Re: [rsyslog] rsyslog adiscon packages
Ubuntu LTS is currently what I'm using so that's advantageous. In
addition, I've built a custom rsyslog package for Ubuntu that includes
omczmq / imczmq along with debs for the dependencies. However, my rsyslog
package is monolithic and I'm using brew2deb, which is kind of a strange
wrapper around fpm and homebrew that probably isn't the best way to do
things.
Ubuntu and Debian pacakge libzmq (but not czmq). Their packages are behind
current, but maybe their packages would be a good and hopefully easy place
to start, depending on how packages are being built currently for the
ubuntu repo.
If there's build scripts for the current repo now, I'd be happy to work
through them and do the work.
Brian
On Wed, Jun 3, 2015 at 11:38 AM, Rainer Gerhards <[email protected]>
wrote:
Would it be a good idea to start with Ubuntu?
Sent from phone, thus brief.
Am 03.06.2015 16:23 schrieb "Brian Knox" <[email protected]>:
I'm on board!
Cheers,
Brian
On Wed, Jun 3, 2015 at 10:07 AM, Rainer Gerhards <
[email protected]
wrote:
Sent from phone, thus brief.
Am 03.06.2015 15:58 schrieb "Brian Knox" <[email protected]>:
I'm a member of the zeromq team :)
I know ;)
What would I need to do?
Join the rsyslog release team and keep an eye especially on zmq. As I
wrote
is just something we need to newly setup.
Brian
On Wed, Jun 3, 2015 at 9:56 AM, Rainer Gerhards <
[email protected]>
wrote:
2015-06-03 14:50 GMT+02:00 Brian Knox <[email protected]>:
I've been working on the new zeromq plugins ( contrib/omczmq and
contrib/imczmq) for a bit, and have been using them in production
myself
for quite awhile.
Yesterday, the zeromq organization released zeromq 4.1 (
http://zeromq.org/intro:get-the-software ) and czmq 3.0 (
http://czmq.zeromq.org/page:get-the-software ) stable releases,
which
are
the versions of zeromq and czmq ( a nice C api on top of libzmq )
that
om/imczmq depend on.
I was wondering if it would be possible to get these added to the
packages
now the same way librdkafka / omkafka is set up.
The dependencies are:
* libsodium ( included in most distros now afaik, but latest
stable
source
is also at
https://download.libsodium.org/libsodium/releases/libsodium-1.0.3.tar.gz
)
* zeromq 4.1 ( http://download.zeromq.org/zeromq-4.1.1.tar.gz )
* czmq 3.0 ( http://download.zeromq.org/czmq-3.0.1.tar.gz )
The main "problem" is that we do not want to be responsible to
maintain 0mq in regard to checking for patches etc... However, if a
member of the 0mq team is also a member of our release team and
looks
after that, this problem can be solved ;)
Maybe we could use a DigitalOcean droplet to run the package
creation
scripts in the future, this would also solve a bit on the
collaboration front. What do you think?
If that's a way to go, it's probably not done immediately, as "a
little bit of setup and redesign work" is involved, but we could
work
towards that goal...
Rainer
The only option flag needed is --enable-libsodium on the zeromq
4.1
build.
I'd be happy to work with whoever works on the packages. Getting
this
easy
to install would be helpful, and the more people attempting to
use
the
plugins the more feedback I can get.
Cheers,
Brian
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a
myriad
of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if
you
DON'T LIKE THAT.
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a
myriad
of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if
you
DON'T LIKE THAT.
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a
myriad
of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you
DON'T LIKE THAT.
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a
myriad
of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you
DON'T LIKE THAT.
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad
of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you
DON'T LIKE THAT.
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad
of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you
DON'T LIKE THAT.
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of
sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE
THAT.
diff --git a/libestr/build.sh b/libestr/build.sh
deleted file mode 100755
index 9c56fcf..0000000
--- a/libestr/build.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-!#/bin/sh
-TARGZFILES=`ls *.dsc`
-PLATFORM="precise saucy"
-ARCHTECT="amd64 i386"
-BRANCHES="v7-stable v7-devel v8-devel"
-
-echo "-------------------------------------"
-echo "--- RPMMaker ---"
-echo "-------------------------------------"
-
-echo "Select DSC Filebasename:"
-select szDscFile in $TARGZFILES
-do
- break;
-done
-
-echo "Select Ubuntu DIST:"
-select szPlatform in $PLATFORM
-do
- break;
-done
-
-echo "Select CPU Platform:"
-select szArch in $ARCHTECT "All"
-do
- case $szArch in "All")
- szArch=$ARCHTECT;
- esac
- break;
-done
-
-echo "Select RSyslog BRANCH:"
-select szBranch in $BRANCHES
-do
- echo "Making Packages for '$szDscFile' ($szBranch) on '$szPlatform'/'$szArch' "
- break;
-done
-
-# Loop through architects
-for szArchitect in $szArch;
-do
- szAddArch="";
- if [ $szArchitect = "i386" ]; then
- szAddArch="-i386";
- fi
-
- # Set Basename!
- szDscFileBase=`basename $szDscFile .dsc`
-
- #echo "$szDscFile $szDscFileBase";
- #exit;
-
- #pbuilder-dist precise create
- APPENDSUFFIX="_$szArchitect.changes"
- pbuilder-dist $szPlatform $szArchitect build $szDscFile
- dput $szBranch ../pbuilder/$szPlatform$szAddArch\_result/$szDscFileBase$APPENDSUFFIX
-done;
diff --git a/libestr/build.sh b/libestr/build.sh
new file mode 120000
index 0000000..0eff50d
--- /dev/null
+++ b/libestr/build.sh
@@ -0,0 +1 @@
+../scripts/build.sh
\ No newline at end of file
diff --git a/rsyslog/common/master/debian/rules b/rsyslog/common/master/debian/rules
index cf78e27..5daeb95 100755
--- a/rsyslog/common/master/debian/rules
+++ b/rsyslog/common/master/debian/rules
@@ -37,7 +37,7 @@ override_dh_auto_configure:
--enable-mmpstrucdata \
--enable-mmsequence \
--enable-pmciscoios \
- --enable-usertools \
+ --disable-usertools \
--disable-testbench \
--with-systemdsystemunitdir=/lib/systemd/system
diff --git a/rsyslog/trusty/v8-devel/debian/rules b/rsyslog/trusty/v8-devel/debian/rules
index cf78e27..5daeb95 100755
--- a/rsyslog/trusty/v8-devel/debian/rules
+++ b/rsyslog/trusty/v8-devel/debian/rules
@@ -37,7 +37,7 @@ override_dh_auto_configure:
--enable-mmpstrucdata \
--enable-mmsequence \
--enable-pmciscoios \
- --enable-usertools \
+ --disable-usertools \
--disable-testbench \
--with-systemdsystemunitdir=/lib/systemd/system
diff --git a/rsyslog/trusty/v8-stable/debian/rules b/rsyslog/trusty/v8-stable/debian/rules
index d619670..6108cdc 100755
--- a/rsyslog/trusty/v8-stable/debian/rules
+++ b/rsyslog/trusty/v8-stable/debian/rules
@@ -40,13 +40,14 @@ override_dh_auto_configure:
--enable-mmsequence \
--enable-pmciscoios \
--enable-mmutf8fix \
- --enable-usertools \
--enable-omudpspoof \
--enable-omkafka \
+ --disable-usertools \
--disable-testbench \
--with-systemdsystemunitdir=/lib/systemd/system
# unstable --enable-jemalloc \
+# --enable-usertools \
# --enable-gssapi-krb5 \
# --enable-guardtime \
# --enable-ommongodb \
diff --git a/scripts/auto_daily_project.sh b/scripts/auto_daily_project.sh
index 1e77fb8..006ae31 100755
--- a/scripts/auto_daily_project.sh
+++ b/scripts/auto_daily_project.sh
@@ -62,7 +62,8 @@ echo " -- Adiscon package maintainers <[email protected]> `da
# Build Source package now!
ls *.tar.gz
-debuild -S -sa -rfakeroot -k"$PACKAGE_SIGNING_KEY_ID"
+#debuild -S -sa -rfakeroot -k"$PACKAGE_SIGNING_KEY_ID"
+debuild -S -us -uc -sa -rfakeroot
if [ $? -ne 0 ]; then
echo "fail in debuild" | mutt -s "$PROJECT daily build failed!" [email protected]
exit 1
@@ -72,14 +73,14 @@ fi
# files are generated in the home directory.
cd ..
-# Upload changes to PPA now!
-dput -f ppa:adiscon/$UPLOAD_PPA `ls *.changes`
-if [ $? -ne 0 ]; then
- echo "fail in dput" | mutt -s "$PROJECT daily build failed!" [email protected]
- exit 1
-fi
+## Upload changes to PPA now!
+#dput -f ppa:adiscon/$UPLOAD_PPA `ls *.changes`
+#if [ $? -ne 0 ]; then
+# echo "fail in dput" | mutt -s "$PROJECT daily build failed!" [email protected]
+# exit 1
+#fi
#cleanup
echo $VERSION >$VERSION_FILE
#exit # do this for testing
rm -rf $LAUNCHPAD_VERSION
-rm -v $szReplaceFile*.dsc $szReplaceFile*.build $szReplaceFile*.changes $szReplaceFile*.upload *.tar.gz
+#rm -v $szReplaceFile*.dsc $szReplaceFile*.build $szReplaceFile*.changes $szReplaceFile*.upload *.tar.gz
diff --git a/scripts/build.sh b/scripts/build.sh
index b2630df..5715232 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -50,8 +50,8 @@ do
#echo "$szDscFile $szDscFileBase";
#exit;
- #pbuilder-dist precise create
+ #pbuilder-dist $szPlatform create
APPENDSUFFIX="_$szArchitect.changes"
pbuilder-dist $szPlatform $szArchitect build $szDscFile
- dput $szBranch ../pbuilder/$szPlatform$szAddArch\_result/$szDscFileBase$APPENDSUFFIX
+ #dput $szBranch ../pbuilder/$szPlatform$szAddArch\_result/$szDscFileBase$APPENDSUFFIX
done;
diff --git a/scripts/config.sh b/scripts/config.sh
index 22cdef0..77c5524 100644
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -1,8 +1,8 @@
-PLATFORM="precise trusty"
-ARCHTECT="amd64 i386"
-BRANCHES="v7-stable v8-stable v8-devel"
+PLATFORM="trusty"
+ARCHTECT="amd64"
+BRANCHES="v8-devel"
# GPG KEY
-KEY_ID=AEF0CF8E
+# KEY_ID=AEF0CF8E
# Mine
# KEY_ID=F6A93574
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of
sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE
THAT.
