dbp/bongo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mail-mta/bongo: update bongo live ebuild to new cmake based build system

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/bongo@1402 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-07-24 19:40:39 +00:00
parent fbff8550fc
commit ded9aa2cf8
9 changed files with 296 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mail-mta/bongo/ChangeLog
View File

@ -1,7 +1,15 @@
# ChangeLog for net-mail/bongo
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# ChangeLog for mail-mta/bongo
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*bongo-0.5.2 (24 Jul 2009)
24 Jul 2009; Mario Fetka <mario.fetka@gmail.com> +bongo-0.5.2.ebuild,
+files/bongo-0.5.2-FORTIFY-1.patch, +files/bongo-FORTIFY-1.patch,
+files/bongo-missing_link-1.patch, +files/bongo-uninitialized-1.patch,
+files/bongo-return_value-1.patch, bongo-9999.ebuild:
update bongo live ebuild to new cmake based build system
07 Dec 2008; Mario Fetka <mario.fetka@gmail.com> +bongo-0.2.91.ebuild,
+bongo-0.2.92.ebuild, +bongo-0.2.93.ebuild, +bongo-0.2.94.ebuild,
+bongo-0.3.0.ebuild:

10
mail-mta/bongo/Manifest
View File

@ -1,12 +1,16 @@
AUX 70bongo 30 RMD160 f88bfbb75ec6605b5df06aed861a13b01c094466 SHA1 f1d44d8fab4e7495ec38e85047f7e800cdfc1965 SHA256 d0ee5aef8f668f6341f2a7fa61b758c62ab5f4e81ef252e9fa4858ed09eea12e
AUX bongo-0.5.2-FORTIFY-1.patch 1660 RMD160 ee7c9d7b5a5ee617cf99cc6e20d4afc371f9697b SHA1 bd71608e91409bd75608d02c42b8600d8ee96bc6 SHA256 082bd297183567705ef7dadb3b0b6c9fa1f8ac88ff3c1e92dbfea20b24db2dea
AUX bongo-FORTIFY-1.patch 781 RMD160 c0b8cb173aa181f8d04eef6eaf9b2d56704a8d57 SHA1 74f19dc40a0a1a4a5f6d62eb99b042f551afee41 SHA256 6c0ef168e8396322c6ea5fd45d729b87e7d3e7b23a725c39ee33ff912aba8e5d
AUX bongo-missing_link-1.patch 536 RMD160 9070f9cc62a2f11490b27db6fa029b42cf5ff38b SHA1 1f3dcff8c1479fcbaf2ebb56da0bfa9e7772c4f3 SHA256 8adddf778f4be64b4f1873ab671cee6065a2b125269e3c101e323a0717d02434
AUX bongo-return_value-1.patch 1061 RMD160 c9445a78f5a45b183a26f8873765384054802f2e SHA1 b6355acad0c45779e01fca68c424c334b940226a SHA256 188e34125343b10eab4dee9113437daf98b4142948ea1c05fd6d810853d17baf
AUX bongo-uninitialized-1.patch 898 RMD160 cdcb340d5f3f47cf1ab76efc1492bccc64030c39 SHA1 53d656689f82968470c642cea92e538c74bead02 SHA256 e091a5eefe1ea3f1292253a0509d51f0b7d3b75eb40cd62f0f2f625a50585e2c
AUX bongo.conf.d 319 RMD160 52a3753da81e87716d80091fe09ac2a6027123b2 SHA1 c40625f749819ae138372e917562734cdc47afba SHA256 6e1386658d9751f892d1dbb7f43f3606b40200f702d5c26d1592ab327f6205e8
AUX bongo.init 795 RMD160 17822d677d9861994229d7154bddec29221cc11c SHA1 e017a66f80afd34956d3679b92c287f5ee1aa418 SHA256 61b4bd024eda1bda2cbb095d7b7e43df4c3007715a9b331e9638d8e9a11bd234
AUX mailer.conf 301 RMD160 5fd76d7292dd4df1157c76c612167b741daed16a SHA1 4f5cabe3cefa47847cfb65d834ac11af477bedf8 SHA256 36f457545e77902a195e111fbec2bff272f21d53113d9be34d826630616dc0da
DIST bongo-0.4.0.tar.bz2 2816258 RMD160 ede8c4fb31b8c35c31a441d168f4ec7b4a553021 SHA1 7bfc4fc145ad9395605afe7fa99fecf63e2260e9 SHA256 031ed931324e9d4757fc237768a0ebc8d30729808256b729c7029a290c1ff493
DIST bongo-0.5.2.tar.bz2 3832896 RMD160 cbff75893e5ed5e314a7a97176e10b8b8c78d3ee SHA1 403d00d25c128b2f27317c4fce273b0e111ac0ac SHA256 af806a7cd460e4f82543fcebdc6e4115174f37933489e2a9cc52cac91e526981
EBUILD bongo-0.4.0.ebuild 2570 RMD160 3702df4ea32aa1e44cdc52021f88398050abdff2 SHA1 37950ace979eb79942d836bdded84c33be4d1826 SHA256 de01a8c4c7c19f8145c9cede31b414d6572ae7eaf2a20a6a15c3b888de3b8dce
EBUILD bongo-0.5.2.ebuild 2481 RMD160 52b0402d413924fd1ed95a5d919aa574035572ed SHA1 cf8074ac3e90e41e2bf8427a3dd9abaf665e82f9 SHA256 fe258425945206d95eb709c4213662b66c77177a6eebc4cd8f1876783d6d1463
EBUILD bongo-9999.ebuild 2727 RMD160 dc01b4a8f7a5114ffd4360575915aca0bf76ee33 SHA1 6aa76d4d856df3c0b85cdc461ccaa81ebdba7dc4 SHA256 39e27321691ef4a36224c7a0e93f86ec6e9f9318b16d6ef9b72372906390dff2
MISC ChangeLog 334 RMD160 35e9dcdaf375966174aeaccd5a174685fd38364c SHA1 27ee68e62cbe5fb5182570bb8a1837b8375c9faa SHA256 5808184cfe7f98d754f9cd9b92d51e0df6e8ff56085d417180ec738854a0d9c2
EBUILD bongo-0.5.2.ebuild 2481 RMD160 745219f83c9c86eabd7af123d91ffc6ac26ecf0f SHA1 839e0da2ffb67e03e7af17481db322de76ddafaf SHA256 0f55dcfed99b24bac53c46ac033c4af051c7cf295603017a319bffe07da0aebb
EBUILD bongo-9999.ebuild 2324 RMD160 d5bc58a663282bf3de32b57dd700829dcb76e100 SHA1 4523cfba92359c2701529a992a96fbfdfa95f988 SHA256 8036a18476ed71e407595dbdc30ef1bc7c303ca8fc5302d0117f30ac5b189e1f
MISC ChangeLog 691 RMD160 368e18f93342add134c28fc224cb1b22635137be SHA1 dfcb1b544efcaeec0542379c93417ea0248557fd SHA256 ae81115673460b6955a2f7c9d1408662800be973de73f6c06c201ac715de5793
MISC metadata.xml 224 RMD160 a75b1683331a8874b18170c82f559bce6877f626 SHA1 da1ebf5ff592428b014945c5ccd1316778f39092 SHA256 de22a32e0eb75abae4c9d09b297c10d3597e4162861d73140fa6db97aa61f02f

112
mail-mta/bongo/bongo-0.5.2.ebuild Normal file
View File

@ -0,0 +1,112 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit eutils multilib flag-o-matic autotools
DESCRIPTION="A calendar and webmail application, which includes its own MTA"
SRC_URI="http://download.gna.org/bongo/release/${P}.tar.bz2"
HOMEPAGE="http://bongo-project.org/"
LICENSE="LGPL-2"
SLOT="0"
IUSE="libgcrypt"
KEYWORDS="-alpha ~amd64 ~arm ~hppa -ia64 -mips ~ppc -ppc64 ~s390 ~sh ~x86"
# regular ebuild
PROVIDE="virtual/mta virtual/mda"
DEPEND="net-nds/openldap
net-libs/gnutls
dev-cpp/clucene
net-misc/curl
>=dev-db/sqlite-3
>=dev-libs/libical-0.40
dev-python/lxml
libgcrypt? ( dev-libs/libgcrypt )"
RDEPEND="${DEPEND}
>=net-mail/mailbase-0.00
!virtual/mta
!net-mail/mailwrapper"
pkg_setup() {
enewgroup bongo
enewuser bongo -1 -1 -1 bongo
# filter-ldflags -Wl,--as-needed --as-needed
}
src_prepare() {
rm -rf import/libical import/sqlite3
epatch ${FILESDIR}/bongo-0.5.2-FORTIFY-1.patch
eautoreconf
}
src_compile() {
use libgcrypt && myconf="${myconf} --with-libgcrypt-prefix=/usr"
econf --with-user=bongo \
--with-clucene=/usr \
--with-sqlite3 \
--with-libcurl \
${myconf} || die
emake || die "emake failed"
}
src_install() {
make DESTDIR=${D} install || die "make failed"
dodir /etc/init.d
exeinto /etc/init.d
newexe ${FILESDIR}/bongo.init bongo
dodir /etc/conf.d
insinto /etc/conf.d
newins ${FILESDIR}/bongo.conf.d bongo
dodir /etc/env.d
insinto /etc/env.d
newins ${FILESDIR}/70bongo 70bongo
dodir /var/lib/bongo
keepdir /var/lib/bongo
fowners bongo:bongo /var/lib/bongo
fperms 770 /var/lib/bongo
dodir /var/run/bongo
keepdir /var/run/bongo
fowners bongo:bongo /var/run/bongo
fperms 770 /var/run/bongo
dosym /usr/sbin/bongo-sendmail /usr/sbin/sendmail
dosym /usr/sbin/bongo-sendmail /usr/lib/sendmail
dosym /usr/sbin/bongo-sendmail /usr/bin/sendmail
dosym /usr/sbin/bongo-sendmail /usr/sbin/mailq
dosym /usr/sbin/bongo-sendmail /usr/sbin/newaliases
}
pkg_postinst() {
elog "Bongo must be setup."
elog "Please run:"
elog " emerge /usr/sbin/bongo-setup"
elog ""
elog "For more information on bongo-setup run /usr/sbin/bongo-setup --help"
elog ""
elog "After bongo is set up run /etc/init.d/bongo start to start the service"
elog ""
elog "The default login settings are as follows:"
elog "username: admin"
elog "password: bongo"
}
pkg_config() {
einfo "Setting up Bongo..."
/usr/sbin/bongo-setup
}

83
mail-mta/bongo/bongo-9999.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2005 Gentoo Foundation
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@ -7,7 +7,7 @@ EAPI="2"
ESVN_REPO_URI="http://svn.gna.org/svn/${PN}/trunk"
inherit eutils multilib flag-o-matic autotools subversion
inherit eutils multilib flag-o-matic cmake-utils subversion
DESCRIPTION="A calendar and webmail application, which includes its own MTA"
@ -17,25 +17,33 @@ HOMEPAGE="http://bongo-project.org/"
LICENSE="LGPL-2"
SLOT="0"
IUSE="libgcrypt mailwrapper"
IUSE=""
KEYWORDS=""
PROVIDE="virtual/mta"
DEPEND="net-nds/openldap
net-libs/gnutls
dev-cpp/clucene
net-misc/curl
# regular ebuild
PROVIDE="virtual/mta virtual/mda"
DEPEND="virtual/libc
>=dev-db/sqlite-3
dev-db/unixODBC
>=dev-lang/python-2.3
>=dev-libs/glib-2.10
>=dev-libs/gmime-2.0
dev-libs/libgcrypt
>=dev-libs/libical-0.40
dev-libs/log4c
net-libs/gnutls
dev-python/lxml
libgcrypt? ( dev-libs/libgcrypt )"
net-misc/curl
net-nds/openldap"
RDEPEND="${DEPEND}
mailwrapper? ( >=net-mail/mailwrapper-0.2 )
!mailwrapper? ( !virtual/mta )
>=net-mail/mailbase-0.00-r5
virtual/logger"
>=net-mail/mailbase-0.00
!virtual/mta
!net-mail/mailwrapper"
mycmakeargs="-DBONGO_USER=bongo"
pkg_setup() {
enewgroup bongo
@ -44,27 +52,15 @@ pkg_setup() {
}
src_prepare() {
# epatch ${FILESDIR}/bongo-0.4.0-libical-1.patch
# epatch ${FILESDIR}/bongo-0.4.0-no-werror-1.patch
eautoreconf
}
src_configure() {
use libgcrypt && myconf="--with-libgcrypt-prefix=/usr"
econf --with-user=bongo \
--with-clucene=/usr \
--with-sqlite3=/usr \
--with-libcurl=/usr \
${myconf} || die
}
src_compile() {
emake || die "emake failed"
epatch ${FILESDIR}/bongo-FORTIFY-1.patch
epatch ${FILESDIR}/bongo-missing_link-1.patch
epatch ${FILESDIR}/bongo-uninitialized-1.patch
epatch ${FILESDIR}/bongo-return_value-1.patch
}
src_install() {
emake DESTDIR="${D}" install || die "make failed"
cmake-utils_src_install
newinitd ${FILESDIR}/bongo.init bongo
newconfd ${FILESDIR}/bongo.conf.d bongo
newenvd ${FILESDIR}/70bongo 70bongo
@ -80,28 +76,19 @@ src_install() {
fperms 770 /var/run/bongo
if use mailwrapper
then
dosym /usr/sbin/bongo-sendmail /usr/bin/sendmail.bongo-sendmail
dosym /usr/sbin/bongo-sendmail /usr/bin/mailq.bongo-sendmail
dosym /usr/sbin/bongo-sendmail /usr/bin/newaliases.bongo-sendmail
insinto /etc/mail
doins "${FILESDIR}"/mailer.conf
else
dosym /usr/sbin/bongo-sendmail /usr/sbin/sendmail
dosym /usr/sbin/bongo-sendmail /usr/lib/sendmail
dosym /usr/sbin/bongo-sendmail /usr/bin/sendmail
dosym /usr/sbin/bongo-sendmail /usr/sbin/mailq
dosym /usr/sbin/bongo-sendmail /usr/sbin/newaliases
fi
dosym /usr/sbin/bongo-sendmail /usr/sbin/sendmail
dosym /usr/sbin/bongo-sendmail /usr/lib/sendmail
dosym /usr/sbin/bongo-sendmail /usr/bin/sendmail
dosym /usr/sbin/bongo-sendmail /usr/sbin/mailq
dosym /usr/sbin/bongo-sendmail /usr/sbin/newaliases
}
pkg_postinst() {
elog "Bongo must be setup."
elog "Please run:"
elog " emerge /usr/sbin/bongo-setup"
elog " emerge /usr/sbin/bongo-config install"
elog ""
elog "For more information on bongo-setup run /usr/sbin/bongo-setup --help"
elog "For more information on bongo-config run /usr/sbin/bongo-config --help"
elog ""
elog "After bongo is set up run /etc/init.d/bongo start to start the service"
elog ""
@ -112,5 +99,5 @@ pkg_postinst() {
pkg_config() {
einfo "Setting up Bongo..."
/usr/sbin/bongo-setup
/usr/sbin/bongo-config install
}

43
mail-mta/bongo/files/bongo-0.5.2-FORTIFY-1.patch Normal file
View File

@ -0,0 +1,43 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-07-23
Initial Package Version: 0.5.2
Origin: me
Upstream Status: unknown
Description: correct O_CREATE
diff -Naur bongo-0.5.2.orig/src/agents/store/command.c bongo-0.5.2/src/agents/store/command.c
--- bongo-0.5.2.orig/src/agents/store/command.c 2009-07-23 16:43:41.485329662 +0000
+++ bongo-0.5.2/src/agents/store/command.c 2009-07-23 17:18:36.470702487 +0000
@@ -2864,7 +2864,7 @@
// put content in place
FindPathToDocument(client, collection->guid, newdocument.guid, path, sizeof(path));
- link(tmppath, path);
+ if( link(tmppath, path)) {}
unlink(tmppath);
// save new object
diff -Naur bongo-0.5.2.orig/src/agents/store/store.c bongo-0.5.2/src/agents/store/store.c
--- bongo-0.5.2.orig/src/agents/store/store.c 2009-07-23 16:43:41.480700081 +0000
+++ bongo-0.5.2/src/agents/store/store.c 2009-07-23 17:20:41.960822704 +0000
@@ -573,7 +573,7 @@
return;
}
RemoveCurrentDirectory();
- fchdir(cwd);
+ if (fchdir(cwd)) {}
}
BongoJsonResult
diff -Naur bongo-0.5.2.orig/src/libs/nmap/bongoagent.c bongo-0.5.2/src/libs/nmap/bongoagent.c
--- bongo-0.5.2.orig/src/libs/nmap/bongoagent.c 2009-07-23 16:43:41.575606246 +0000
+++ bongo-0.5.2/src/libs/nmap/bongoagent.c 2009-07-23 16:52:23.604934672 +0000
@@ -55,7 +55,7 @@
const int buff_size = 50;
snprintf(path, XPL_MAX_PATH, "%s/guru-meditation-%d", XPL_DEFAULT_WORK_DIR, (int)time(NULL));
- boomfile = open(path, O_CREAT | O_WRONLY);
+ boomfile = open(path, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR);
if (boomfile != -1) {
void * const buffer[buff_size];
int buff_used;

19
mail-mta/bongo/files/bongo-FORTIFY-1.patch Normal file
View File

@ -0,0 +1,19 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-07-23
Initial Package Version: 0.5.2
Origin: me
Upstream Status: unknown
Description: correct O_CREATE
diff -Naur bongo-0.5.2.orig/src/libs/nmap/bongoagent.c bongo-0.5.2/src/libs/nmap/bongoagent.c
--- bongo-0.5.2.orig/src/libs/nmap/bongoagent.c 2009-07-23 16:43:41.575606246 +0000
+++ bongo-0.5.2/src/libs/nmap/bongoagent.c 2009-07-23 16:52:23.604934672 +0000
@@ -55,7 +55,7 @@
const int buff_size = 50;
snprintf(path, XPL_MAX_PATH, "%s/guru-meditation-%d", XPL_DEFAULT_WORK_DIR, (int)time(NULL));
- boomfile = open(path, O_CREAT | O_WRONLY);
+ boomfile = open(path, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR);
if (boomfile != -1) {
void * const buffer[buff_size];
int buff_used;

18
mail-mta/bongo/files/bongo-missing_link-1.patch Normal file
View File

@ -0,0 +1,18 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-07-24
Initial Package Version: svn rev 1129
Origin: me
Upstream Status: unknown
Description: add missing link
diff -Naur bongo-9999.orig/src/libs/cal/CMakeLists.txt bongo-9999/src/libs/cal/CMakeLists.txt
--- bongo-9999.orig/src/libs/cal/CMakeLists.txt 2009-07-24 19:09:04.282134900 +0000
+++ bongo-9999/src/libs/cal/CMakeLists.txt 2009-07-24 19:09:25.767662534 +0000
@@ -23,6 +23,7 @@
bongoxpl
bongoutil
bongomemmgr
+ bongojson
${LIBICAL_LIBRARIES}
)

31
mail-mta/bongo/files/bongo-return_value-1.patch Normal file
View File

@ -0,0 +1,31 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-07-23
Initial Package Version: 0.5.2
Origin: me
Upstream Status: unknown
Description: correct return values
diff -Naur bongo-0.5.2.orig/src/agents/store/command.c bongo-0.5.2/src/agents/store/command.c
--- bongo-0.5.2.orig/src/agents/store/command.c 2009-07-23 16:43:41.485329662 +0000
+++ bongo-0.5.2/src/agents/store/command.c 2009-07-23 17:18:36.470702487 +0000
@@ -2864,7 +2864,7 @@
// put content in place
FindPathToDocument(client, collection->guid, newdocument.guid, path, sizeof(path));
- link(tmppath, path);
+ if( link(tmppath, path)) {}
unlink(tmppath);
// save new object
diff -Naur bongo-0.5.2.orig/src/agents/store/store.c bongo-0.5.2/src/agents/store/store.c
--- bongo-0.5.2.orig/src/agents/store/store.c 2009-07-23 16:43:41.480700081 +0000
+++ bongo-0.5.2/src/agents/store/store.c 2009-07-23 17:20:41.960822704 +0000
@@ -573,7 +573,7 @@
return;
}
RemoveCurrentDirectory();
- fchdir(cwd);
+ if (fchdir(cwd)) {}
}
BongoJsonResult

21
mail-mta/bongo/files/bongo-uninitialized-1.patch Normal file
View File

@ -0,0 +1,21 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-07-24
Initial Package Version: svn rev 1129
Origin: me
Upstream Status: unknown
Description: correct some uninitalized vars
diff -Naur bongo-9999.orig/src/agents/antispam/spamd.c bongo-9999/src/agents/antispam/spamd.c
--- bongo-9999.orig/src/agents/antispam/spamd.c 2009-07-24 19:20:10.580512815 +0000
+++ bongo-9999/src/agents/antispam/spamd.c 2009-07-24 19:27:01.580367405 +0000
@@ -346,8 +346,8 @@
for (i=0; i < ASpam.spamd.hostlist->len; i++) {
char *hostitem = g_array_index(ASpam.spamd.hostlist, char*, i);
char *lHost = MemStrdup(hostitem);
- char *host;
- int port, weight;
+ char *host = host;
+ int port = 0 , weight = 0;
ParseHost(lHost, &host, &port, &weight);
ConnAddressPoolAddHost(&ASpam.spamd.hosts, host, port, weight);
MemFree(lHost);