diff betw. rapid's and the svn. asterisk

Kilian Krause kk@verfaction.de
Tue, 15 Feb 2005 15:47:30 +0100


--=-l7L4057nhlPeyf1vyUv5
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Hi Tzafrir,

> diff -ur ../../asterisk-1.0.5/debian/asterisk-config.install debian/aster=
isk-config.install
> --- ../../asterisk-1.0.5/debian/asterisk-config.install	2005-02-08 19:53:=
38.000000000 +0200
> +++ debian/asterisk-config.install	2005-02-08 11:08:55.000000000 +0200
> @@ -1 +1 @@
> -etc/asterisk
> +etc
>=20
> Hmmm... What exactly is the asterisk-config package? For me it
> represents only the asterisk configuration. Thus should only include
> /etc/asterisk.

We're still waiting for Mark to clear out why asterisk-config was split
out from asterisk. The /etc/ in asterisk-config is needed to
catch /etc/default/asterisk which is in asterisk-config rather than
asterisk.



> diff -ur ../../asterisk-1.0.5/debian/asterisk.install debian/asterisk.ins=
tall
> --- ../../asterisk-1.0.5/debian/asterisk.install	2005-02-08 19:53:38.0000=
00000 +0200
> +++ debian/asterisk.install	2005-02-08 11:08:55.000000000 +0200
>=20
> This, again, is for moving unnecessary things out of asterisk-config
>=20
> @@ -1,4 +1,3 @@
> -/etc/default
>  usr/lib/asterisk
>  usr/sbin
>  usr/share/asterisk/agi-bin

Hmmm, as /etc/init.d/asterisk is in asterisk and not in asterisk-config
i guess that's ok. Added to the SVN.

> diff -ur ../../asterisk-1.0.5/debian/asterisk-config.default debian/aster=
isk-config.default
> --- ../../asterisk-1.0.5/debian/asterisk-config.default	2005-02-15 14:47:=
09.000000000 +0200
> +++ debian/asterisk-config.default	2005-02-08 11:08:55.000000000 +0200
> @@ -5,16 +5,14 @@
>  #               real-time priority (pass '-p' to asterisk). un-rem the=20
>  #               following line to disable asterisk from running in real-=
time=20
>  #               priority
> -#AST_REALTIME=3Dno
> +AST_REALTIME=3Dno
>=20
> The default config file should have no unremmed values, IMHO. I don't
> think we can assume certain values are available in the config file.
>=20
> I also believe that there is no longer a need to disable real-time
> priority to enable running as a separate user.

The realtime is already default, your SVN copy is out of date. It
already was when you wrote your email. I had the same idea this noon. =3D)

Both AST_REALTIME and SAFE_ASTERISK are now rem'd with the properly
toggled setting.

Only the new "don't start by default" switch is on.

>  #
>  # PARAMS: exra parameters to pass to asterisk
>  #         The example here may help you in debugging, but is not intende=
d for=20
>  #         production use.
> -#         When you give -G *only* that group will be used, else all grou=
ps=20
> -#         of the asterisk user.
> +#         When you give -G *only* that group will be used, else all grou=
ps of the asterisk user.
>  #PARAMS=3D"-g -vvv"
>=20
> 80 columns, please. That's what there is in the console.=20

fixed.


>  #
>  #
> -# RUNASTSAFE: run safe_asterisk rather than asterisk (will auto-restart=20
> -#             upon crash)
> -#RUNASTSAFE=3Dno
> +# RUNASTSAFE: run safe_asterisk rather than asterisk (will auto-restart =
upon crash)
> +RUNASTSAFE=3Dno
>=20
> The two commnents above.

no idea where you get this from, but my SVN copy reads now:
#
# RUNASTSAFE: run safe_asterisk rather than asterisk (will auto-restart upo=
n
#             crash)
#RUNASTSAFE=3Dyes



> diff -ur ../../asterisk-1.0.5/debian/asterisk.init debian/asterisk.init
> --- ../../asterisk-1.0.5/debian/asterisk.init	2005-02-15 14:42:14.0000000=
00 +0200
> +++ debian/asterisk.init	2005-02-14 10:15:07.000000000 +0200
>=20
> Many modifications here. It is more robust. It also allows the option
> 'debug' so someone trying to trace the case of failed asterisk startup
> wn't run asterisk -c as root by accident and step over files owned by
> asterisk.
>=20
[snip]

i'll go through that again, but currently i'm quite happy with what's
there. Feel free to propose smaller sniplets with a rationale in greater
detail than "more robust". The not-as-root is already in there, please
check latest SVN.


> diff -ur ../../asterisk-1.0.5/debian/patches/00list debian/patches/00list
> --- ../../asterisk-1.0.5/debian/patches/00list	2005-02-14 16:30:36.000000=
000 +0200
> +++ debian/patches/00list	2005-02-14 10:15:07.000000000 +0200
>=20
> A number of our patches. spandsp will eventually be removed once I merge
> the separate package from Debian. And I'll force i586 rather than 386
> for the moment.

i guess the actual patches are further down from here, right?
[snip: 00list]

> diff -ur ../../asterisk-1.0.5/debian/postinst debian/postinst
> --- ../../asterisk-1.0.5/debian/postinst	2005-02-14 14:11:59.000000000 +0=
200
> +++ debian/postinst	2005-02-08 11:08:55.000000000 +0200
>=20
> This one should be replaced, when I figure a better option.
> It is needed on udev-less systems (basically: 2.4).
>=20
> Any idea for a more appropriate to do that on install/start-up time
> would be wellcome.

WELL.. i also wondered about this one. And for now i still believe all
this should be handled by a zaptel package. Moreover i don't think
asterisk.asterisk is the right permission. Rather a root.dialout would
come to mind. And then adding asterisk to the dialout group as we now
support the initgroups of the asterisk user. I'd really wish Santiago
would reply to my mails about zaphfc where i already brought this issue
up.


> @@ -27,11 +27,6 @@
>  	chown -R asterisk.asterisk /var/log/asterisk /var/run/asterisk \
>  		/var/spool/asterisk /var/lib/asterisk /etc/asterisk=20
>  	chmod o-rwx /etc/asterisk/*
> -	if [ -d /dev/zap ] && [ -e /dev/zap/ctl ]
> -	then
> -		chown asterisk.asterisk /dev/zap/*
> -		chmod o-rwx /dev/zap/*
> -	fi
> =20
>      ;;
> =20
> ../../asterisk-1.0.5/debian/-=D7=91 =D7=A7=D7=A8 =D7=90=D7=A6=D7=9E=D7=A0=
 rapid_conf
> ../../asterisk-1.0.5/debian/-=D7=91 =D7=A7=D7=A8 =D7=90=D7=A6=D7=9E=D7=A0=
 README.Debian
> diff -ur ../../asterisk-1.0.5/debian/rules debian/rules
> --- ../../asterisk-1.0.5/debian/rules	2005-02-15 15:29:07.000000000 +0200
> +++ debian/rules	2005-02-15 15:27:07.000000000 +0200
>=20
> The rapid_conf stuff is basically rapid-specific, as it relies on the
> globinclude patch. But feel free to take whatever you like from that
> directory.
>=20
> But I don't see any need for addmailbox on /usr/sbin . Asterisk creates
> mailboxes fine on its own. And if someone really needs that script, it
> is still avilable in the contrib dir.

from the asterisk deb:
-rwxr-xr-x root/root      1520 2005-02-14 17:59:38 ./usr/sbin/addmailbox

Apparently you missed it. =3D)


> @@ -96,7 +96,8 @@
>  	$(MAKE) INSTALL_PREFIX=3D$(CURDIR)/debian/tmp install samples
>  	cp debian/asterisk.conf $(CURDIR)/debian/tmp/etc/asterisk/asterisk.conf
>  	cp channels/h323/h323.conf.sample $(CURDIR)/debian/tmp/etc/asterisk/h32=
3.conf
> -	cp -a debian/rapid_conf/*  $(CURDIR)/debian/tmp/etc/asterisk/
> +	cp contrib/scripts/addmailbox $(CURDIR)/debian/tmp/usr/sbin/
> +	chmod +x $(CURDIR)/debian/tmp/usr/sbin/addmailbox
>  	mkdir -p $(CURDIR)/debian/tmp/etc/default/
>  	cp debian/asterisk-config.default $(CURDIR)/debian/tmp/etc/default/aste=
risk
>  	mkdir -p $(CURDIR)/debian/tmp/usr/lib/cgi-bin/asterisk/
> diff -ur ../../asterisk-1.0.5/debian/control debian/control
> --- ../../asterisk-1.0.5/debian/control	2005-02-15 14:55:47.000000000 +02=
00
> +++ debian/control	2005-02-14 10:15:07.000000000 +0200
>=20
> Description: I'd like more verbose descriptions for packages. But
> then-again, I figure you're more experinced than me.=20
>=20
> @@ -40,17 +40,11 @@
>  Replaces: asterisk (<=3D 1:1.0.2-2)
>  Section: comm
>  Depends: ${shlibs:Depends}
> -Description: h323 support for the Asterisk PBX
> - Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
> - sense, middleware between Internet and telephony channels on the bottom=
,
> - and Internet and telephony applications at the top.
> - .
> - Asterisk can be used with Voice over IP (SIP, H.323, IAX) standards, or=
 the=20
> - Public Switched Telephone Network (PSTN) through Supported Hardware.
> - .
> - This package provides a h323 support for the Asterisk system.
> - It was separated out into its own package because of openh323's many=20
> - dependencies
> +Description: asterisk H.323 VoIP channel
> + This package provides a h323 support for the Asterisk Open Source PBX s=
ystem.
> + .
> + It was separated out into its own package to avoid having the main pack=
age
> + depend on the many openh323 dependencies

this one will die anyway. No real need to edit around there, it's not
gonna be supported once asterisk-oh323 is in. And from a personal point
of view i don't see that much of a difference in the descriptions.

[snip]

Maybe Jose can comment on what he thinks if the generic
"asterisk-header" should remain in the descriptions. For now we quite
happily use it for the pwlib/openh323 et.al., but it's worth
reconsidering every once in a while.

Thanks for the rest of the tips!

--=20
Best regards,
 Kilian

--=-l7L4057nhlPeyf1vyUv5
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: Dies ist ein digital signierter Nachrichtenteil

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQBCEguCvdkzt4X+wX8RAkgXAJ9QtPgBHPlazmolIlbZDrgc77P5qQCfXsWH
e4/y/FdAtk0Zj9RfiX8/YiI=
=8jTd
-----END PGP SIGNATURE-----

--=-l7L4057nhlPeyf1vyUv5--