[SM-Commit] GIT changes to master grimoire by Arjan Bouter (ec17b5d227a1f5873def34b1d3cd1314ee1e6254)

Arjan Bouter scm at sourcemage.org
Tue Mar 9 12:14:00 EST 2010


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 ChangeLog                                |    3 +
 accounts                                 |    2 
 chat-im/amsn/DETAILS                     |    6 +-
 chat-im/amsn/HISTORY                     |    3 +
 chat-im/amsn/amsn-0.98.1.tar.bz2.sig     |    0 
 chat-im/amsn/amsn-0.98.3-src.tar.bz2.sig |binary
 dev/null                                 |binary
 groups                                   |    1 
 utils/avahi/BUILD                        |   16 +++++-
 utils/avahi/CONFIGURE                    |   12 ++++
 utils/avahi/DEPENDS                      |   81 +++++++++++++++++++------------
 utils/avahi/HISTORY                      |    4 +
 utils/avahi/PRE_BUILD                    |   11 +++-
 13 files changed, 103 insertions(+), 36 deletions(-)

New commits:
commit a961618bc92e25debd2dcfeb1ebe0f3bc7a0ce5c
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    avahi: started work on the dependency mess, it still needs work on
    disabling optional features.

commit 4b97967a83aa0fcb28c2b4bf9577831e51ae154d
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    amsn: version 0.98.3

diff --git a/ChangeLog b/ChangeLog
index 168bbf3..bac5c79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-03-09 Arjan Bouter <abouter at sourcemage.org>
+	* accounts, groups: added additional avahi users and groups
+
 2010-03-09 Pol Vinogradov <vin.public at gmail.com>
 	* utils/simh: new spell, a highly portable, multi-system simulator
 
diff --git a/accounts b/accounts
index c159501..41cbd6f 100755
--- a/accounts
+++ b/accounts
@@ -80,7 +80,9 @@ nginx:164:170
 halevt:165:172
 oprofile:166:173
 flowd:167:174
+avahi:168:162
 tss:175:175
 memcached:176:177
 camera:177:178
+avahi-autoipd:180:180
 nobody:65534:65534
diff --git a/chat-im/amsn/DETAILS b/chat-im/amsn/DETAILS
index d22b21a..9da3899 100755
--- a/chat-im/amsn/DETAILS
+++ b/chat-im/amsn/DETAILS
@@ -11,11 +11,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/msn
   FORCE_DOWNLOAD=on
    SOURCE_URL[0]=http://amsn.sourceforge.net/$SOURCE
 else
-         VERSION=0.98.1
+         VERSION=0.98.3
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-          SOURCE=$SPELL-$VERSION.tar.bz2
+          SOURCE=$SPELL-$VERSION-src.tar.bz2
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-   SOURCE_URL[0]=$SOURCEFORGE_URL/amsn/$SOURCE
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
 fi
         WEB_SITE=http://amsn.sourceforge.net
 	 ENTERED=20021220
diff --git a/chat-im/amsn/HISTORY b/chat-im/amsn/HISTORY
index 39ffe4f..9abd700 100644
--- a/chat-im/amsn/HISTORY
+++ b/chat-im/amsn/HISTORY
@@ -1,3 +1,6 @@
+2010-03-09 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: updated spell to 0.98.3
+
 2009-10-25 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.98.1
 
diff --git a/chat-im/amsn/amsn-0.98.1.tar.bz2.sig b/chat-im/amsn/amsn-0.98.1.tar.bz2.sig
deleted file mode 100644
index eb328f4..0000000
Binary files a/chat-im/amsn/amsn-0.98.1.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/amsn/amsn-0.98.3-src.tar.bz2.sig b/chat-im/amsn/amsn-0.98.3-src.tar.bz2.sig
new file mode 100644
index 0000000..825ba03
Binary files /dev/null and b/chat-im/amsn/amsn-0.98.3-src.tar.bz2.sig differ
diff --git a/groups b/groups
index f26e988..2aaacad 100755
--- a/groups
+++ b/groups
@@ -103,5 +103,6 @@ pkcs11:176:
 memcached:177:
 camera:178:
 libvirt:179:
+avahi-autoipd:180
 users:1000:
 nogroup:65534:
diff --git a/utils/avahi/BUILD b/utils/avahi/BUILD
index b5cd0b1..ae1e961 100755
--- a/utils/avahi/BUILD
+++ b/utils/avahi/BUILD
@@ -1,2 +1,16 @@
-OPTS="${OPTS} --with-distro=none --with-avahi-user=root --with-avahi-group=avahi" &&
+OPTS="${OPTS} --with-distro=none --with-avahi-user=avahi --with-avahi-group=avahi" &&
+OPTS="${OPTS} --with-avahi-priv-access-group=netdev " &&
+
+if [[ "$AVAHI_AUTOIPD" == 'y' ]]; then
+  OPTS="${OPTS} --with-autoipd-user=avahi-autoipd --with-autoipd-group=avahi-autoipd"
+fi &&
+
+if [[ "$AVAHI_DAEMON" == 'n' ]]; then
+  OPTS="${OPTS} --with-xml=none"
+fi &&
+
+if [[ "$AVAHI_NODBUS" == 'y' ]]; then
+  OPTS="${OPTS} --disable-dbus"
+fi &&
+
 default_build
diff --git a/utils/avahi/CONFIGURE b/utils/avahi/CONFIGURE
new file mode 100755
index 0000000..f093165
--- /dev/null
+++ b/utils/avahi/CONFIGURE
@@ -0,0 +1,12 @@
+message "Don't be alarmed if this spell seems to ignores your answers to the" &&
+message "next questions and the optional dependencies. It does so on purpose." &&
+message "Some parts of avahi depend on eachother or are automatically enabled" &&
+message "by it's build system, for more info check:" &&
+message "http://avahi.org/wiki/DownloadAvahi#Requirements" &&
+config_query AVAHI_CLIENT "Build avahi client?" n &&
+config_query AVAHI_DAEMON "Build avahi daemon?" n &&
+config_query AVAHI_UTILS "Build avahi utils? (auto-enables the client)" n &&
+if [[ "$AVAHI_UTILS" == 'y' ]]; then AVAHI_CLIENT=y; fi &&
+config_query AVAHI_DISCOVER "Build avahi discover?" n &&
+config_query AVAHI_BOOKMARKS "Build avahi bookmarks?" n &&
+config_query AVAHI_AUTOIPD "Build avahi autoipd?" n
diff --git a/utils/avahi/DEPENDS b/utils/avahi/DEPENDS
index 9b00ef0..666a751 100755
--- a/utils/avahi/DEPENDS
+++ b/utils/avahi/DEPENDS
@@ -1,9 +1,4 @@
-depends python && sub_depends python GDBM &&
-
-optional_depends glib2 \
-                 "--enable-glib" "--disable-glib" \
-                 "Use GLib2?" &&
-
+# stuff from SUB_DEPENDS
 optional_depends qt-x11 \
                  "--enable-qt3" "--disable-qt3" \
                  "Build Qt3 mainloop integration?" &&
@@ -12,42 +7,70 @@ optional_depends qt4 \
                  "--enable-qt4" "--disable-qt4" \
                  "Build Qt4Core mainloop integration?" &&
 
+optional_depends mono \
+                 "--enable-mono" "--disable-mono" \
+                 "Enable mono bindings?" &&
+
 optional_depends gtk+2 \
                  "--enable-gtk" "--disable-gtk" \
                  "Use GTK+2?" &&
 
-if is_depends_enabled $SPELL gtk+2; then
+optional_depends glib2 \
+                 "--enable-glib" "--disable-glib" \
+                 "Enable glib bindings?" &&
+
+if ( is_depends_enabled $SPELL qt-x11 ) || ( is_depends_enabled $SPELL qt4 ) || \
+   ( is_depends_enabled $SPELL mono ) || ( is_depends_enabled $SPELL gtk+2 ) || \
+   ( is_depends_enabled $SPELL glib2 ); then
+    AVAHI_CLIENT=y
+fi &&
+
+optional_depends doxygen '' '--disable-doxygen-doc' 'install documentation?' &&
+
+if [[ "$AVAHI_DISCOVER" == 'y' ]]; then
    depends libglade2
 fi &&
 
-optional_depends dbus-python \
-                 "--enable-dbus" "--disable-dbus" \
-                 "Use D-BUS?" &&
+# for the daemon it's technically optional, but that would make the spell unreliable
+if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_DAEMON" == 'y' ]] || \
+   [[ "$AVAHI_CLIENT" == 'y' ]] || [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
+   depends dbus --enable-dbus
+else
+   AVAHI_NODBUS=y
+fi &&
+
 
-optional_depends expat \
-                 "--enable-expat" "--disable-expat" \
-                 "Use Expat?" &&
+if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
+   depends dbus-python '--enable-dbus' &&
+   depends pygtk2 '--enable-pygtk'
+fi &&
 
-optional_depends gdbm \
-                 "--enable-gdbm" "--disable-gdbm" \
-                 "Use GDBM?" &&
+if [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
+   depends twisted
+fi &&
 
-optional_depends libdaemon \
-                 "--enable-libdaemon" "--disable-libdaemon" \
-                 "Use libdaemon?" &&
+if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_UTILS" == 'y' ]]; then
+   optional_depends gdbm "--enable-gdbm" "--disable-gdbm" "Use GDBM?"
+fi &&
 
-optional_depends python \
-                 "--enable-python" "--disable-python" \
-                 "Enable scripts that depends on python?" &&
+if [[ "$AVAHI_DISCOVER" == 'y' ]] && ( is_depends_enabled $SPELL gdbm ); then
+   depends python '--enable-python' &&
+   depends -sub GDBM python
+fi &&
 
-optional_depends pygtk2 \
-                 "--enable-pygtk" "--disable-pygtk" \
-                 "Make use of GTK in Python?" &&
+if [[ "$AVAHI_DAEMON" == 'y' ]]; then
+  depends libdaemon --enable-libdaemon &&
+  depends expat  --with-xml=expat &&
+  optional_depends libcap '' '' 'for chroot support'
+fi &&
 
-optional_depends mono \
-                 "--enable-mono" "--disable-mono" \
-                 "Enable mono bindings?" &&
+# avahi depends on gtk-sharp-2 when both the dbus and mono dependencies are enabled
+if ( is_depends_enabled $SPELL dbus ) && ( is_depends_enabled $SPELL mono ); then
+  depends gtk-sharp-2
+fi &&
 
-optional_depends monodoc \
+if ( is_depends_enabled $SPELL mono ); then
+   optional_depends monodoc \
                  "--enable-monodoc" "--disable-monodoc" \
                  "Enable documentation for mono bindings?"
+fi
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 3672669..8b7640a 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,7 @@
+2010-03-02 Arjan Bouter <abouter at sourcemage.org>
+	* BUILD, PRE_BUILD: use avahi users instead of root
+	* BUILD, CONFIGURE, DEPENDS: attempt to make sense of dependency mess
+
 2009-10-20 Donald Johnson <ltdonny at gmail.com>
 	* DEPENDS: added sub on python with GDBM
 
diff --git a/utils/avahi/PRE_BUILD b/utils/avahi/PRE_BUILD
index b38a6de..493a8f6 100755
--- a/utils/avahi/PRE_BUILD
+++ b/utils/avahi/PRE_BUILD
@@ -1,6 +1,11 @@
 default_pre_build                          &&
-cd $SOURCE_DIRECTORY 	                   &&
+cd "${SOURCE_DIRECTORY}"                   &&
 patch  -p1 < $SPELL_DIRECTORY/qt.patch     &&
 autoreconf                                 &&
-create_group  netdev                       &&
-create_group  avahi
+create_group    netdev                     &&
+create_group    avahi                      &&
+create_account  avahi                      &&
+if [[ "$AVAHI_AUTOIPD" == 'y' ]]; then
+  create_group    avahi-autoipd            &&
+  create_account  avahi-autoipd
+fi



More information about the SM-Commit mailing list