[oe-commits] org.oe.dev callweaver: follow upstream from openpbx.org to callweaver.org and update to rc5
Laibsch commit
openembedded-commits at lists.openembedded.org
Sat Jan 19 12:05:11 UTC 2008
callweaver: follow upstream from openpbx.org to callweaver.org and update to rc5
* openpbx.org is gone and thus fetching failed.
* upgrade to rc5 since rc3 is no longer available
* Follow upstream rename of project from openpbx.org to callweaver.org. replace
all occurences of the openpbx string with callweaver in all files.
* drop unneeded patches and create new ones (fix version check code)
* drop openldap support and DEPENDS until bug 2806 is fixed to enable the package
to build in OE
* fix packaging
* this is the "boy, am I glad I got it off the 'mtn status'-radar"-commit
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: f72228bf5c0b557773b6190cde0040a17e2a6571
ViewMTN: http://monotone.openembedded.org/revision/info/f72228bf5c0b557773b6190cde0040a17e2a6571
Files:
1
packages/openpbx/openpbx.org-1.2_rc3
packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch
packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch
packages/openpbx
packages/callweaver
packages/openpbx/openpbx.org-perl.bb
packages/callweaver/callweaver-perl.bb
packages/openpbx/openpbx.org_1.2_rc3.bb
packages/callweaver/callweaver_1.2.0-rc5.bb
packages/callweaver/files/bootstrap.patch
packages/callweaver/files/init
packages/callweaver/files/logrotate
packages/callweaver/files/volatiles
Diffs:
#
# mt diff -rb1835c42933e0c943d142d1781f5b360a057294b -rf72228bf5c0b557773b6190cde0040a17e2a6571
#
#
#
# delete "packages/openpbx/openpbx.org-1.2_rc3"
#
# delete "packages/openpbx/openpbx.org-1.2_rc3/bootstrap.patch"
#
# delete "packages/openpbx/openpbx.org-1.2_rc3/openssl.m4.patch"
#
# rename "packages/openpbx"
# to "packages/callweaver"
#
# rename "packages/openpbx/openpbx.org-perl.bb"
# to "packages/callweaver/callweaver-perl.bb"
#
# rename "packages/openpbx/openpbx.org_1.2_rc3.bb"
# to "packages/callweaver/callweaver_1.2.0-rc5.bb"
#
# add_file "packages/callweaver/files/bootstrap.patch"
# content [7cf1b8ed9e96ad3dd722d00e23f80f09135ad0d6]
#
# patch "packages/callweaver/callweaver-perl.bb"
# from [fc9d6bb9b361043d8bc9be5c55c87fc3e9b77645]
# to [f3b53a7064297124c35cb3011acf03dcf8b1301b]
#
# patch "packages/callweaver/callweaver_1.2.0-rc5.bb"
# from [b0b507eb0cba54b21a33e14568dd61f3f4657e13]
# to [ee0289ba433af46423d96382dc196aed501bbf1c]
#
# patch "packages/callweaver/files/init"
# from [83c4189583e0f7e1283394a7943c4ec451ffceb1]
# to [9bb4bb4237f6f665c247e0cd6dfaebf561fe71f3]
#
# patch "packages/callweaver/files/logrotate"
# from [8ff34611f7d6783f91a3812b33e78a7ae20484cb]
# to [e4b5cc8dd9c9fcb58853108398fd5b594482622e]
#
# patch "packages/callweaver/files/volatiles"
# from [51324914bcc354b1d60232efa7db5a930f50721d]
# to [ab58de51d8049358ed9817fbc26b6399c074e514]
#
============================================================
--- packages/callweaver/files/bootstrap.patch 7cf1b8ed9e96ad3dd722d00e23f80f09135ad0d6
+++ packages/callweaver/files/bootstrap.patch 7cf1b8ed9e96ad3dd722d00e23f80f09135ad0d6
@@ -0,0 +1,13 @@
+Index: callweaver-1.2-rc5/bootstrap.sh
+===================================================================
+--- callweaver-1.2-rc5.orig/bootstrap.sh 2008-01-18 10:47:41.000000000 +0100
++++ callweaver-1.2-rc5/bootstrap.sh 2008-01-18 10:48:02.000000000 +0100
+@@ -36,7 +36,7 @@
+ debug "Found $COMMAND"
+ fi
+
+- INS_VER=`$COMMAND --version | head -1 | sed 's/[^0-9]*//' | cut -d' ' -f1`
++ INS_VER=`$COMMAND --version | head -n 1 | sed 's/[^0-9]*//' | cut -d' ' -f1`
+ INS_MAJOR=`echo $INS_VER | cut -d. -f1 | sed s/[a-zA-Z\-].*//g`
+ INS_MINOR=`echo $INS_VER | cut -d. -f2 | sed s/[a-zA-Z\-].*//g`
+ INS_MICRO=`echo $INS_VER | cut -d. -f3 | sed s/[a-zA-Z\-].*//g`
============================================================
--- packages/openpbx/openpbx.org-perl.bb fc9d6bb9b361043d8bc9be5c55c87fc3e9b77645
+++ packages/callweaver/callweaver-perl.bb f3b53a7064297124c35cb3011acf03dcf8b1301b
@@ -1,24 +1,23 @@
-DESCRIPTION = "Openpbx::OGI Perl Gateway Interface Module"
-HOMEPAGE = "http://www.openpbx.org"
+DESCRIPTION = "Callweaver::OGI Perl Gateway Interface Module"
+HOMEPAGE = "http://www.callweaver.org"
SECTION = "libs"
LICENSE = "GPL"
DEPENDS = "install-native"
-RDEPENDS = "perl openpbx.org-ogi"
+RDEPENDS = "perl callweaver-ogi"
PR = "r0"
+S = "${WORKDIR}/callweaver-1.2-${CWRCV}/contrib/ogi-perl/callweaver-perl-0.0.1"
-OPBXV = "openpbx.org-1.2_rc3"
+CWRCV = "rc5"
-SRC_URI = "http://www.openpbx.org/releases/${OPBXV}.tar.gz"
+SRC_URI = "http://devs.callweaver.org/release/callweaver-1.2.0-${CWRCV}.tar.bz2"
-S = "${WORKDIR}/${OPBXV}/contrib/ogi-perl/openpbx-perl-${PV}"
-
inherit cpan
do_install_append () {
- install -d ${D}${datadir}/openpbx.org/ogi/perl
- install ${S}/examples/* ${D}${datadir}/openpbx.org/ogi/perl
+ install -d ${D}${datadir}/callweaver/ogi/perl
+ install ${S}/examples/* ${D}${datadir}/callweaver/ogi/perl
}
PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${datadir}/callweaver/ogi/perl"
-FILES_${PN}-examples = "${datadir}/openpbx.org/ogi/perl"
============================================================
--- packages/openpbx/openpbx.org_1.2_rc3.bb b0b507eb0cba54b21a33e14568dd61f3f4657e13
+++ packages/callweaver/callweaver_1.2.0-rc5.bb ee0289ba433af46423d96382dc196aed501bbf1c
@@ -1,37 +1,37 @@ DESCRIPTION = "A flexible VOIP soft swit
DESCRIPTION = "A flexible VOIP soft switch/PBX."
-DESCRIPTION_${PN}-ogi = "OpenPBX Gateway Inerface for scripted PBX call processing"
-DESCRIPTION_${PN}-fax = "Fax send/receive file and T.38 support for OpenPBX"
-DESCRIPTION_${PN}-ldap = "LDAP Directory services interface for OpenPBX"
-DESCRIPTION_${PN}-sounds = "Standard set of audio prompts for OpenPBX"
-HOMEPAGE = "http://www.openpbx.org"
+DESCRIPTION_${PN}-ogi = "Callweaver Gateway Interface for scripted PBX call processing"
+DESCRIPTION_${PN}-fax = "Fax send/receive file and T.38 support for Callweaver"
+DESCRIPTION_${PN}-ldap = "LDAP Directory services interface for Callweaver"
+DESCRIPTION_${PN}-sounds = "Standard set of audio prompts for Callweaver"
+HOMEPAGE = "http://www.callweaver.org"
RDEPENDS = "ssmtp"
SECTION = "voip"
LICENSE = "GPL"
-DEPENDS = "openssl zlib tiff libcap spandsp speex readline js \
+DEPENDS = "openssl zlib tiff libcap spandsp (>= 0.0.3+0.0.4pre10) speex readline js \
sox-native findutils-native"
-DEPENDS_${PN}-ldap = "openldap"
RRECOMMENDS = "logrotate"
-RRECOMMENDS_${PN}-ogi = "perl perl-module-strict openpbx.org-perl"
-PV = "1.2_rc3"
-PR = "r2"
+RRECOMMENDS_${PN}-ogi = "perl perl-module-strict callweaver-perl"
+PR = "r0"
+S = "${WORKDIR}/callweaver-1.2-rc5"
-SRC_URI = "http://www.openpbx.org/releases/${P}.tar.gz \
- svn://svn.openpbx.org/openpbx-sounds/trunk/sounds/en_US;module=MelanieTaylor;proto=svn \
+CWRCV = "rc5"
+
+SRC_URI = "http://devs.callweaver.org/release/callweaver-1.2.0-${CWRCV}.tar.bz2 \
+ svn://svn.callweaver.org/callweaver-sounds/trunk/sounds/en_US;module=MelanieTaylor;proto=https;rev=4466 \
file://bootstrap.patch;patch=1 \
- file://openssl.m4.patch;patch=1 \
file://logrotate \
file://volatiles \
file://init"
PARALLEL_MAKE = ""
-INITSCRIPT_NAME = "openpbx"
+INITSCRIPT_NAME = "callweaver"
INITSCRIPT_PARAMS = "defaults 60"
inherit autotools update-rc.d
EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \
--disable-zaptel --with-directory-layout=lsb --enable-t38 \
- --with-codec-speex=${STAGING_DIR}/${HOST_SYS} --with-app_ldap \
+ --with-codec-speex=${STAGING_DIR}/${HOST_SYS} \
--with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \
--with-javascript --with-res_js \
--bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \
@@ -48,9 +48,9 @@ do_install_append() {
}
do_install_append() {
- install -c -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openpbx
- install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/openpbx
- install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/openpbx
+ install -c -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/callweaver
+ install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/callweaver
+ install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/callweaver
# And now for sounds...
for file in `find ${WORKDIR}/MelanieTaylor -name \*.wav`; do
echo $file
@@ -60,80 +60,82 @@ do_install_append() {
sox -V $file -t gsm -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.gsm/` resample -ql;
relfile=`echo $file|sed -e s:^${WORKDIR}/MelanieTaylor/::`
relfile2=`echo $relfile|sed -e s:\.wav$::`
- install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.sln ${D}${datadir}/openpbx.org/sounds/$relfile2.sln
- install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.ulaw ${D}${datadir}/openpbx.org/sounds/$relfile2.ulaw
- install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.alaw ${D}${datadir}/openpbx.org/sounds/$relfile2.alaw
- install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.gsm ${D}${datadir}/openpbx.org/sounds/$relfile2.gsm
+ install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.sln ${D}${datadir}/callweaver/sounds/$relfile2.sln
+ install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.ulaw ${D}${datadir}/callweaver/sounds/$relfile2.ulaw
+ install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.alaw ${D}${datadir}/callweaver/sounds/$relfile2.alaw
+ install -c -D -m 644 ${WORKDIR}/MelanieTaylor/$relfile2.gsm ${D}${datadir}/callweaver/sounds/$relfile2.gsm
done
}
-PACKAGES = "${PN}-sounds ${PN}-fax ${PN}-ogi ${PN}-ldap ${PN}-doc ${PN}-dev ${PN}"
-
-FILES_${PN}-sounds = "${datadir}/openpbx.org/sounds/*"
-FILES_${PN}-dev = "${libdir}/openpbx.org/modules/*.la \
- ${libdir}/openpbx.org/*.la \
- ${includedir}/openpbx/*"
-FILES_${PN}-fax = "${libdir}/openpbx.org/modules/app_backgrounddetect.so \
- ${libdir}/openpbx.org/modules/app_faxdetect.so \
- ${libdir}/openpbx.org/modules/app_rxfax.so \
- ${libdir}/openpbx.org/modules/app_txfax.so"
-FILES_${PN}-ogi = "${libdir}/openpbx.org/modules/res_ogi.so \
- ${datadir}/openpbx.org/ogi/*"
-FILES_${PN}-ldap = "${libdir}/openpbx.org/modules/app_ldap.*"
-
pkg_postinst_prepend() {
- grep -q openpbx ${sysconfdir}/group || addgroup --system openpbx
- grep -q openpbx ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/openpbx.org --no-create-home --disabled-password --ingroup openpbx -s ${base_bindir}/false openpbx
- chown -R openpbx:openpbx ${libdir}/openpbx.org ${localstatedir}/lib/openpbx.org ${localstatedir}/spool/openpbx.org ${localstatedir}/log/openpbx.org ${localstatedir}/run/openpbx.org ${sysconfdir}/openpbx.org ${datadir}/openpbx.org
+ grep -q callweaver ${sysconfdir}/group || addgroup --system callweaver
+ grep -q callweaver ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/callweaver --no-create-home --disabled-password --ingroup callweaver -s ${base_bindir}/false callweaver
+ chown -R callweaver:callweaver ${libdir}/callweaver ${localstatedir}/lib/callweaver ${localstatedir}/spool/callweaver ${localstatedir}/log/callweaver ${localstatedir}/run/callweaver ${sysconfdir}/callweaver ${datadir}/callweaver
/etc/init.d/populate-volatile.sh update
}
pkg_postinst_${PN}-fax () {
- chown -R openpbx:openpbx ${libdir}/openpbx.org
+ chown -R callweaver:callweaver ${libdir}/callweaver
}
pkg_postinst_${PN}-ldap () {
- chown -R openpbx:openpbx ${libdir}/openpbx.org
+ chown -R callweaver:callweaver ${libdir}/callweaver
}
pkg_postinst_${PN}-sounds () {
- chown -R openpbx:openpbx ${datadir}/openpbx.org
+ chown -R callweaver:callweaver ${datadir}/callweaver
}
+CONFFILES_${PN} += "${sysconfdir}/callweaver/musiconhold.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/adsi.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/adtranvofr.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/agents.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/cdr.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/callweaver.adsi"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/callweaver.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/cdr_custom.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/cdr_manager.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/cdr_tds.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/codecs.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/dnsmgr.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/dundi.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/enum.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/extconfig.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/extensions.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/extensions.ael"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/features.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/iax.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/indications.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/logger.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/manager.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/meetme.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/mgcp.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/modem.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/modules.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/muted.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/osp.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/privacy.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/queues.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/rpt.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/rtp.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/sip.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/sip_notify.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/udptl.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/voicemail.conf"
+CONFFILES_${PN} += "${sysconfdir}/callweaver/woomera.conf"
+
+PACKAGES = "${PN}-dbg ${PN}-sounds ${PN}-fax ${PN}-ogi ${PN}-ldap ${PN}-doc ${PN}-dev ${PN}"
+
+FILES_${PN}-dbg += "${datadir}/callweaver/ogi/.debug ${libdir}/callweaver/modules/.debug"
+FILES_${PN}-sounds += "${datadir}/callweaver/sounds/*"
+FILES_${PN}-dev += "${libdir}/callweaver/modules/*.la \
+ ${libdir}/callweaver/*.la \
+ ${libdir}/callweaver/*.so \
+ ${includedir}/callweaver/*"
+FILES_${PN}-fax += "${libdir}/callweaver/modules/app_backgrounddetect.so \
+ ${libdir}/callweaver/modules/app_faxdetect.so \
+ ${libdir}/callweaver/modules/app_rxfax.so \
+ ${libdir}/callweaver/modules/app_txfax.so"
+FILES_${PN}-ogi += "${libdir}/callweaver/modules/res_ogi.so \
+ ${datadir}/callweaver/ogi/*"
+FILES_${PN}-ldap += "${libdir}/callweaver/modules/app_ldap.*"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/musiconhold.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adsi.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adtranvofr.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/agents.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr_custom.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr_manager.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr_tds.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/codecs.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/dnsmgr.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/dundi.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/enum.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extconfig.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extensions.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extensions.ael"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/features.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/iax.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/indications.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/logger.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/manager.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/meetme.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/mgcp.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/modem.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/modules.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/muted.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/openpbx.adsi"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/openpbx.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/osp.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/privacy.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/queues.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/rpt.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/rtp.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/sip.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/sip_notify.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/udptl.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/voicemail.conf"
-CONFFILES_${PN} += "${sysconfdir}/openpbx.org/woomera.conf"
============================================================
--- packages/callweaver/files/init 83c4189583e0f7e1283394a7943c4ec451ffceb1
+++ packages/callweaver/files/init 9bb4bb4237f6f665c247e0cd6dfaebf561fe71f3
@@ -1,23 +1,23 @@
#! /bin/sh
#
# This is an init script for openembedded
-# Copy it to /etc/init.d/openpbx and type
-# > update-rc.d openpbx defaults 60
+# Copy it to /etc/init.d/callweaver and type
+# > update-rc.d callweaver defaults 60
#
-openpbx=/usr/sbin/openpbx
-pidfile=/var/ru%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list