Remove ability to disable SQLite3 as per Diego Elio "Flameeyes" Pettenò in bug #39085...
authorTony Vroon <chainsaw@gentoo.org>
Mon, 5 Dec 2011 13:16:51 +0000 (13:16 +0000)
committerTony Vroon <chainsaw@gentoo.org>
Mon, 5 Dec 2011 13:16:51 +0000 (13:16 +0000)
Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

net-misc/asterisk/ChangeLog
net-misc/asterisk/Manifest
net-misc/asterisk/asterisk-10.0.0_rc2-r1.ebuild [new file with mode: 0644]

index 4700c8917ea95923a32b2709287727e37420fb95..ff939534c977adee40ea82a008d6e90547cbb8fa 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.358 2011/11/16 10:31:11 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.359 2011/12/05 13:16:51 chainsaw Exp $
+
+*asterisk-10.0.0_rc2-r1 (05 Dec 2011)
+
+  05 Dec 2011; Tony Vroon <chainsaw@gentoo.org> +asterisk-10.0.0_rc2-r1.ebuild:
+  Remove ability to disable SQLite3 as per Diego Elio "Flameeyes" Pettenò in
+  bug #390855. Fix regression in database show; upstream bug #ASTERISK-18886.
 
 *asterisk-10.0.0_rc2 (16 Nov 2011)
 
index 052a38fd317a782b8f5605a50d518d3197be4b90..f9f3288b70c2a2a86809cf3900160c535edc52fb 100644 (file)
@@ -16,16 +16,18 @@ DIST asterisk-10.0.0-rc2.tar.gz 24701615 RMD160 1432ece7741df808338b77e3392ebd19
 DIST gentoo-asterisk-patchset-1.4.tar.bz2 31078 RMD160 3e24de735eb1754951708cd23e73ad125b9f626b SHA1 ed725bceb74ca1cf961a2e97fe12e89eb66b1719 SHA256 315a3878d3c591030b73d9796e0264f924ef5bde51ee682dc011974bf91b6630
 DIST gentoo-asterisk-patchset-1.5.tar.bz2 32182 RMD160 38081074d9814b8d3bc7130c37debf34f19a53c5 SHA1 8d3a5bda76ed1d32feda1e109e8affc75ffd7917 SHA256 458f03fef712166fc5e983f24fa6a53befbb1910d1e63cc7e79a3c83872f39ab
 DIST gentoo-asterisk-patchset-2.0.tar.bz2 6125 RMD160 75fa8bf76e11ee12025ed3f38ab06998a752ad59 SHA1 f38a963c8d479a248b151f089fe172a701d6b505 SHA256 b02fb7e7e1d281a653fd98d7389a0a1777376398572c06ecb912fe7ed0b6c9e2
+DIST gentoo-asterisk-patchset-2.1.tar.bz2 6848 RMD160 1601b9c9d5ce37b899b9a4966f4789b77478ae89 SHA1 d9b60ecd171519820b7b03e42d579fe93470c74f SHA256 a5ef7f43f50b3089687e1c11dbb4978c0d61dfbe0a8c3ea08712757720dafaa2
 EBUILD asterisk-1.8.7.1-r1.ebuild 14426 RMD160 c20d9e317692e83f0a5985ec631dacccf977cf03 SHA1 22f6ec06d74858039dacd74dbd99714d2e5e7ea0 SHA256 f7a50dddd72af95d9153be25e2a6b31a9af0688a62c75d0596148def5193732c
 EBUILD asterisk-1.8.7.1-r2.ebuild 8441 RMD160 654f1647f7d697fd627750a11f1c1a9c91f997a4 SHA1 f9672bccb99f752c31e5911fcdd210e9134fc63b SHA256 7a577c3798d1201758755cb77938863940ac9b3cf518445a54821b8ba251ee25
 EBUILD asterisk-1.8.7.1.ebuild 14423 RMD160 ac4edbba788830ab10237d3f4a3ab743aee7bd70 SHA1 127e0deff4a40acd49b5adf6e247977efc7f507b SHA256 220eba22c0217d08b69efe0c715b417996b20eda7c509142544b7f69ba3d47aa
+EBUILD asterisk-10.0.0_rc2-r1.ebuild 8522 RMD160 fa83866c6c1e40313c5b12799af43eb7622e44bb SHA1 b3abaf0d65249432c3c672e58a4d3367d1066b6d SHA256 420901ec5aeaa97817006314adcd6ed2c55773f856427d26207ac33651049932
 EBUILD asterisk-10.0.0_rc2.ebuild 8441 RMD160 e48034208665ea98dc26050a0493d62d6ea23512 SHA1 746652b78e78c93ebcbc2cb593184932ae607fc0 SHA256 a74f9f3152209bddf9f074f02c37ca109c8ae3b27574497fc4537cca995e1c20
-MISC ChangeLog 90440 RMD160 150afb5916ce169d07c2699e6ba01a433723ef9f SHA1 9afbb4f328f9db2bc1ce33a612bf77a351aa1060 SHA256 1085e98ab574ad85dc057dd2024903467bfe4d75cf42bffc63244086fe0e67cf
+MISC ChangeLog 90716 RMD160 6b76efd846ed6eb1145e6edb0a845f22b904ff97 SHA1 f5d7c50253e6ea96a87fb6ae202eadba25e4fab8 SHA256 a6b091ccb6177d3567aad444ced3cf8ed0a41fc9316f4f93775fb9b5bc0ed550
 MISC metadata.xml 1028 RMD160 5b59e20d3efbe652abf786d05a7b9744105a088b SHA1 e718c3ce0210047b34a05c92ff8a7b4707316e17 SHA256 63267079fefbcc798d902e6b9822609df79c756a9934c3ad3abdabfbad357de5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7DkQQACgkQp5vW4rUFj5pRhwCfVRWC375x49GP0iNV62RN74oE
-PZkAniFgyofxtmqPF5uegJWIPTUJdZBK
-=XK2w
+iEYEARECAAYFAk7cxFwACgkQp5vW4rUFj5rawQCeNlxJ0RGt5UX9cojBrWBPaf92
+ROgAn021rlhiAjkLDOugshyyUSCL5Os0
+=Zo/1
 -----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-10.0.0_rc2-r1.ebuild b/net-misc/asterisk/asterisk-10.0.0_rc2-r1.ebuild
new file mode 100644 (file)
index 0000000..f4aca48
--- /dev/null
@@ -0,0 +1,287 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-10.0.0_rc2-r1.ebuild,v 1.1 2011/12/05 13:16:51 chainsaw Exp $
+
+EAPI=4
+inherit autotools base eutils linux-info multilib
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/${MY_P}.tar.gz
+        mirror://gentoo/gentoo-asterisk-patchset-2.1.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ais alsa bluetooth calendar +caps curl dahdi debug doc freetds gtalk http iconv jabber jingle ldap lua mysql newt +samples odbc osplookup oss portaudio postgres radius snmp span speex srtp static syslog usb vorbis"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+RDEPEND="dev-db/sqlite:3
+       dev-libs/popt
+       dev-libs/libxml2
+       dev-libs/openssl
+       ais? ( sys-cluster/openais )
+       alsa? ( media-libs/alsa-lib )
+       bluetooth? ( net-wireless/bluez )
+       calendar? ( net-libs/neon
+                dev-libs/libical
+                dev-libs/iksemel )
+       caps? ( sys-libs/libcap )
+       curl? ( net-misc/curl )
+       dahdi? ( >=net-libs/libpri-1.4.12_beta2
+               net-misc/dahdi-tools )
+       freetds? ( dev-db/freetds )
+       gtalk? ( dev-libs/iksemel )
+       http? ( dev-libs/gmime:2.4 )
+       iconv? ( virtual/libiconv )
+       jabber? ( dev-libs/iksemel )
+       jingle? ( dev-libs/iksemel )
+       ldap? ( net-nds/openldap )
+       lua? ( dev-lang/lua )
+       mysql? ( dev-db/mysql )
+       newt? ( dev-libs/newt )
+       odbc? ( dev-db/unixODBC )
+       osplookup? ( net-libs/osptoolkit )
+       portaudio? ( media-libs/portaudio )
+       postgres? ( dev-db/postgresql-base )
+       radius? ( net-dialup/radiusclient-ng )
+       snmp? ( net-analyzer/net-snmp )
+       span? ( media-libs/spandsp )
+       speex? ( media-libs/speex )
+       srtp? ( net-libs/libsrtp )
+       usb? ( dev-libs/libusb
+               media-libs/alsa-lib )
+       vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${RDEPEND}
+       !net-libs/openh323"
+
+RDEPEND="${RDEPEND}
+       syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+       net-misc/asterisk-extra-sounds
+       net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+       CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+       local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+       have reported that this module dropped critical SIP packets in their deployments. You
+       may want to disable it if you see such problems."
+       check_extra_config
+
+       enewgroup asterisk
+       enewgroup dialout 20
+       enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+       base_src_prepare
+       AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+       econf \
+               --libdir="/usr/$(get_libdir)" \
+               --localstatedir="/var" \
+               --with-crypto \
+               --with-gsm=internal \
+               --with-popt \
+               --with-ssl \
+               --with-z \
+               $(use_with caps cap) \
+               $(use_with http gmime) \
+               $(use_with newt) \
+               $(use_with portaudio)
+
+       # Blank out sounds/sounds.xml file to prevent
+       # asterisk from installing sounds files (we pull them in via
+       # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+       >"${S}"/sounds/sounds.xml
+
+       # Compile menuselect binary for optional components
+       emake menuselect.makeopts
+
+       # Broken functionality is forcibly disabled (bug #360143)
+       menuselect/menuselect --disable chan_misdn menuselect.makeopts
+       menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+       # Utility set is forcibly enabled (bug #358001)
+       menuselect/menuselect --enable smsq menuselect.makeopts
+       menuselect/menuselect --enable streamplayer menuselect.makeopts
+       menuselect/menuselect --enable aelparse menuselect.makeopts
+       menuselect/menuselect --enable astman menuselect.makeopts
+
+       # this is connected, otherwise it would not find
+       # ast_pktccops_gate_alloc symbol
+       menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+       menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+       # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+       menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+       menuselect/menuselect --enable func_aes menuselect.makeopts
+       menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+       # SQlite3 is now the main database backend, enable related features
+       menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+       menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+       # The others are based on USE-flag settings
+       use_select() {
+               local state=$(use "$1" && echo enable || echo disable)
+               shift # remove use from parameters
+
+               while [[ -n $1 ]]; do
+                       menuselect/menuselect --${state} "$1" menuselect.makeopts
+                       shift
+               done
+       }
+
+       use_select ais                  res_ais
+       use_select alsa                 chan_alsa
+       use_select bluetooth    chan_mobile
+       use_select calendar             res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+       use_select curl                 func_curl res_config_curl res_curl
+       use_select dahdi                app_dahdibarge app_dahdiras chan_dahdi codec_dahdi res_timing_dahdi
+       use_select freetds              {cdr,cel}_tds
+       use_select gtalk                chan_gtalk
+       use_select http                 res_http_post
+       use_select iconv                func_iconv
+       use_select jabber               res_jabber
+       use_select jingle               chan_jingle
+       use_select ldap                 res_config_ldap
+       use_select lua                  pbx_lua
+       use_select mysql                app_mysql cdr_mysql res_config_mysql
+       use_select odbc                 cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+       use_select osplookup    app_osplookup
+       use_select oss                  chan_oss
+       use_select postgres             {cdr,cel}_pgsql res_config_pgsql
+       use_select radius               {cdr,cel}_radius
+       use_select snmp                 res_snmp
+       use_select span                 res_fax_spandsp
+       use_select speex                {codec,func}_speex
+       use_select srtp                 res_srtp
+       use_select syslog               cdr_syslog
+       use_select usb                  chan_usbradio
+       use_select vorbis               format_ogg_vorbis
+}
+
+src_compile() {
+       ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+       mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+       emake DESTDIR="${D}" installdirs
+       emake DESTDIR="${D}" install
+
+       if use radius; then
+               insinto /etc/radiusclient-ng/
+               doins contrib/dictionary.digium
+       fi
+       if use samples; then
+               emake DESTDIR="${D}" samples
+               for conffile in "${D}"etc/asterisk/*.*
+               do
+                       chown asterisk:asterisk $conffile
+                       chmod 0660 $conffile
+               done
+               einfo "Sample files have been installed"
+       else
+               einfo "Skipping installation of sample files..."
+               rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+               rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+               rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+               rm -f  "${D}"etc/asterisk/* || die
+       fi
+       rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+       # keep directories
+       diropts -m 0770 -o asterisk -g asterisk
+       keepdir /etc/asterisk
+       keepdir /var/lib/asterisk
+       keepdir /var/run/asterisk
+       keepdir /var/spool/asterisk
+       keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+       diropts -m 0750 -o asterisk -g asterisk
+       keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+       newinitd "${FILESDIR}"/1.8.0/asterisk.initd asterisk
+       newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+       # install the upgrade documentation
+       #
+       dodoc README UPGRADE* BUGS CREDITS
+
+       # install extra documentation
+       #
+       if use doc
+       then
+               dodoc doc/*.txt
+               dodoc doc/*.pdf
+       fi
+
+       # install SIP scripts; bug #300832
+       #
+       dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+       dodoc "${FILESDIR}/1.6.2/find_call_sip_trace.sh"
+       dodoc "${FILESDIR}/1.6.2/find_call_ids.sh"
+       dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+       # install logrotate snippet; bug #329281
+       #
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
+}
+
+pkg_postinst() {
+       #
+       # Announcements, warnings, reminders...
+       #
+       einfo "Asterisk has been installed"
+       echo
+       elog "If you want to know more about asterisk, visit these sites:"
+       elog "http://www.asteriskdocs.org/"
+       elog "http://www.voip-info.org/wiki-Asterisk"
+       echo
+       elog "http://www.automated.it/guidetoasterisk.htm"
+       echo
+       elog "Gentoo VoIP IRC Channel:"
+       elog "#gentoo-voip @ irc.freenode.net"
+       echo
+       echo
+       elog "1.6 -> 1.8 changes that you may care about:"
+       elog "http://svn.asterisk.org/svn/${PN}/tags/${PV}/UPGRADE.txt"
+       elog "or: bzless ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.bz2"
+}
+
+pkg_config() {
+       einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+       read tmp
+       tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+       if [[ "$tmp" = "y" ]] ||\
+               [[ "$tmp" = "yes" ]]
+       then
+               einfo "Resetting permissions to defaults..."
+
+               for x in spool run lib log; do
+                       chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+                       chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+               done
+
+               chown -R root:asterisk  "${ROOT}"etc/asterisk
+               chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+               einfo "done"
+       else
+               einfo "skipping"
+       fi
+}