From f0fa42126da9e3eec6b98388b35c67929fa20dae Mon Sep 17 00:00:00 2001 From: root Date: Sun, 4 Mar 2012 00:01:47 +0000 Subject: Sun Mar 4 00:01:47 UTC 2012 --- community-staging/encfs/PKGBUILD | 33 ++ community-staging/glob2/PKGBUILD | 34 ++ community-staging/glob2/glob2-0.9.4.1-gcc44.patch | 87 ++++ community-staging/glob2/glob2.install | 12 + community-staging/glom/PKGBUILD | 35 ++ community-staging/glom/glom.install | 15 + community-staging/smc/PKGBUILD | 46 +++ community-staging/smc/smc-for-cegui-v0-7.diff | 437 +++++++++++++++++++++ community-staging/smc/smc.desktop | 9 + community-staging/smc/smc.png | Bin 0 -> 2961 bytes community/kadu/PKGBUILD | 8 +- community/nodejs/PKGBUILD | 6 +- community/radvd/PKGBUILD | 48 ++- community/radvd/radvd.conf | 3 + community/radvd/radvd.rc | 34 ++ community/radvd/radvd.service | 8 + community/rekonq/PKGBUILD | 13 +- community/rekonq/fix-build.patch | 11 + community/roxterm/PKGBUILD | 10 +- core/syslinux/PKGBUILD | 12 +- core/syslinux/syslinux-install_update | 22 +- core/syslinux/syslinux.cfg | 2 +- extra/alsa-utils/PKGBUILD | 9 +- extra/cifs-utils/PKGBUILD | 7 +- extra/cvsps/PKGBUILD | 37 +- extra/cvsps/call-cvs-q-option.patch | 34 ++ extra/cvsps/cvsps-2.2b1-bufferoverflow.patch | 65 +++ extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch | 133 +++++++ extra/cvsps/cvsps-2.2b1-man.patch | 29 ++ extra/cvsps/seperate-CPPFLAGS.patch | 29 ++ extra/cvsps/use-INADDR_NONE-define.patch | 28 ++ extra/cvsps/use-__linux__-define.patch | 36 ++ extra/cvsps/use-offsetof-macro.patch | 32 ++ extra/gnutls/PKGBUILD | 10 +- extra/libxfont/PKGBUILD | 10 +- extra/mercurial/PKGBUILD | 16 +- extra/samba/PKGBUILD | 28 +- extra/samba/samba | 4 +- extra/sane/PKGBUILD | 8 +- extra/tftp-hpa/PKGBUILD | 15 +- .../tftp-hpa-0.49-fortify-strcpy-crash.patch | 26 ++ extra/xorg-xfs/PKGBUILD | 22 +- extra/ypserv/PKGBUILD | 21 +- extra/ypserv/confpost.patch | 14 + libre/linux-libre/PKGBUILD | 17 +- libre/linux-libre/config.i686 | 2 +- libre/linux-libre/config.x86_64 | 2 +- libre/linux-libre/linux-libre.install | 4 +- multilib-testing/gcc-multilib/PKGBUILD | 14 +- multilib-testing/libtool-multilib/PKGBUILD | 74 ++++ multilib-testing/libtool-multilib/libtool.install | 22 ++ multilib/wine/PKGBUILD | 6 +- social/uci/PKGBUILD | 40 ++ testing/gcc/PKGBUILD | 14 +- testing/grep/PKGBUILD | 37 ++ testing/grep/grep.install | 21 + testing/libtool/PKGBUILD | 49 +++ testing/libtool/libtool.install | 20 + testing/nfs-utils/PKGBUILD | 73 ++++ testing/nfs-utils/exports | 15 + testing/nfs-utils/idmapd.conf | 14 + testing/nfs-utils/kernel-3.0-segfault.patch | 53 +++ testing/nfs-utils/nfs-common | 315 +++++++++++++++ testing/nfs-utils/nfs-common.conf | 40 ++ testing/nfs-utils/nfs-server | 299 ++++++++++++++ testing/nfs-utils/nfs-server.conf | 29 ++ testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch | 39 ++ testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch | 15 + testing/nfs-utils/nfs-utils.install | 32 ++ testing/nfs-utils/start-statd.patch | 22 ++ testing/sudo/PKGBUILD | 8 +- testing/tzdata/Makefile.patch | 140 +++++++ testing/tzdata/PKGBUILD | 47 +++ 73 files changed, 2807 insertions(+), 154 deletions(-) create mode 100644 community-staging/encfs/PKGBUILD create mode 100644 community-staging/glob2/PKGBUILD create mode 100644 community-staging/glob2/glob2-0.9.4.1-gcc44.patch create mode 100644 community-staging/glob2/glob2.install create mode 100644 community-staging/glom/PKGBUILD create mode 100644 community-staging/glom/glom.install create mode 100644 community-staging/smc/PKGBUILD create mode 100644 community-staging/smc/smc-for-cegui-v0-7.diff create mode 100644 community-staging/smc/smc.desktop create mode 100644 community-staging/smc/smc.png create mode 100644 community/radvd/radvd.conf create mode 100644 community/radvd/radvd.rc create mode 100644 community/radvd/radvd.service create mode 100644 community/rekonq/fix-build.patch create mode 100644 extra/cvsps/call-cvs-q-option.patch create mode 100644 extra/cvsps/cvsps-2.2b1-bufferoverflow.patch create mode 100644 extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch create mode 100644 extra/cvsps/cvsps-2.2b1-man.patch create mode 100644 extra/cvsps/seperate-CPPFLAGS.patch create mode 100644 extra/cvsps/use-INADDR_NONE-define.patch create mode 100644 extra/cvsps/use-__linux__-define.patch create mode 100644 extra/cvsps/use-offsetof-macro.patch create mode 100644 extra/tftp-hpa/tftp-hpa-0.49-fortify-strcpy-crash.patch create mode 100644 extra/ypserv/confpost.patch create mode 100644 multilib-testing/libtool-multilib/PKGBUILD create mode 100644 multilib-testing/libtool-multilib/libtool.install create mode 100644 social/uci/PKGBUILD create mode 100644 testing/grep/PKGBUILD create mode 100644 testing/grep/grep.install create mode 100644 testing/libtool/PKGBUILD create mode 100644 testing/libtool/libtool.install create mode 100644 testing/nfs-utils/PKGBUILD create mode 100644 testing/nfs-utils/exports create mode 100644 testing/nfs-utils/idmapd.conf create mode 100644 testing/nfs-utils/kernel-3.0-segfault.patch create mode 100644 testing/nfs-utils/nfs-common create mode 100644 testing/nfs-utils/nfs-common.conf create mode 100644 testing/nfs-utils/nfs-server create mode 100644 testing/nfs-utils/nfs-server.conf create mode 100644 testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch create mode 100644 testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch create mode 100644 testing/nfs-utils/nfs-utils.install create mode 100644 testing/nfs-utils/start-statd.patch create mode 100644 testing/tzdata/Makefile.patch create mode 100644 testing/tzdata/PKGBUILD diff --git a/community-staging/encfs/PKGBUILD b/community-staging/encfs/PKGBUILD new file mode 100644 index 000000000..fe713cc2d --- /dev/null +++ b/community-staging/encfs/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 66952 2012-03-02 18:18:38Z lcarlier $ +# Contributor: Andrea Scarpino +# Contributor: Jaroslaw Swierczynski +# Contributor: Sven Kauber, +# Maintainer: Daniel J Griffiths + +pkgname=encfs +pkgver=1.7.4 +pkgrel=7 +pkgdesc='Encrypted filesystem in user-space' +arch=('i686' 'x86_64') +url='http://www.arg0.net/encfs' +license=('GPL') +depends=('rlog' 'openssl' 'fuse' 'boost-libs') +makedepends=('boost') +options=('!libtool') +source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz") +md5sums=('ac90cc10b2e9fc7e72765de88321d617') + +build(){ + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/glob2/PKGBUILD b/community-staging/glob2/PKGBUILD new file mode 100644 index 000000000..041374e94 --- /dev/null +++ b/community-staging/glob2/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 66954 2012-03-02 18:35:34Z lcarlier $ +# Contributor: Jaroslaw Swierczynski +# Contributor: Roman Kyrylych + +pkgname=glob2 +pkgver=0.9.4.4 +pkgrel=11 +pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" +arch=('i686' 'x86_64') +url="http://www.globulation2.org/" +license=('GPL3') +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' + 'fribidi' 'desktop-file-utils') +makedepends=('scons' 'boost') +install=glob2.install +source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz + glob2-0.9.4.1-gcc44.patch) +md5sums=('94c527325f355a29a2807f8f18a6e6a8' 'b13cb1f73ece23bfc6413773678d583e') +sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad' '3e5ae81d85a727387a7049c3a0dfb3db930391b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch" + scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share" +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + + scons install + find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \; + install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png" +} diff --git a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch new file mode 100644 index 000000000..b425b25ec --- /dev/null +++ b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch @@ -0,0 +1,87 @@ +diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h +--- libgag/include/StreamBackend.h.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/include/StreamBackend.h 2009-06-20 14:21:10.000000000 +0200 +@@ -43,7 +43,7 @@ namespace GAGCore + virtual void flush(void) = 0; + virtual void read(void *data, size_t size) = 0; + virtual void putc(int c) = 0; +- virtual int getc(void) = 0; ++ virtual int get_c(void) = 0; + virtual void seekFromStart(int displacement) = 0; + virtual void seekFromEnd(int displacement) = 0; + virtual void seekRelative(int displacement) = 0; +@@ -67,7 +67,7 @@ namespace GAGCore + virtual void flush(void) { assert(fp); fflush(fp); } + virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); } + virtual void putc(int c) { assert(fp); fputc(c, fp); } +- virtual int getc(void) { assert(fp); return fgetc(fp); } ++ virtual int get_c(void) { assert(fp); return fgetc(fp); } + virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); } + virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); } + virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); } +@@ -92,7 +92,7 @@ namespace GAGCore + virtual void flush(void); + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +@@ -117,7 +117,7 @@ namespace GAGCore + virtual void flush(void) { } + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp +--- libgag/src/StreamBackend.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/StreamBackend.cpp 2009-06-20 14:21:53.000000000 +0200 +@@ -75,9 +75,9 @@ namespace GAGCore + buffer->putc(c); + } + +- int ZLibStreamBackend::getc(void) ++ int ZLibStreamBackend::get_c(void) + { +- return buffer->getc(); ++ return buffer->get_c(); + } + + void ZLibStreamBackend::seekFromStart(int displacement) +@@ -147,7 +147,7 @@ namespace GAGCore + write(&ch, 1); + } + +- int MemoryStreamBackend::getc(void) ++ int MemoryStreamBackend::get_c(void) + { + Uint8 ch; + read(&ch, 1); +diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp +--- libgag/src/Stream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/Stream.cpp 2009-06-20 14:21:35.000000000 +0200 +@@ -60,7 +60,7 @@ namespace GAGCore + std::string s; + while (1) + { +- int c = backend->getc(); ++ int c = backend->get_c(); + if(c=='\r') + continue; + if ((c >= 0) && (c != '\n')) +diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp +--- libgag/src/TextStream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/TextStream.cpp 2009-06-20 14:21:22.000000000 +0200 +@@ -150,7 +150,7 @@ namespace GAGCore + + int nextChar(void) + { +- next = stream->getc(); ++ next = stream->get_c(); + if (next == '\n') + { + column = 0; diff --git a/community-staging/glob2/glob2.install b/community-staging/glob2/glob2.install new file mode 100644 index 000000000..7463b6e76 --- /dev/null +++ b/community-staging/glob2/glob2.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} + diff --git a/community-staging/glom/PKGBUILD b/community-staging/glom/PKGBUILD new file mode 100644 index 000000000..4ad6510e2 --- /dev/null +++ b/community-staging/glom/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 66958 2012-03-02 19:47:35Z lcarlier $ +# Maintainer: Roman Kyrylych +# Contributor: William Rea +# Contributor: Jaroslav Lichtblau + +pkgname=glom +pkgver=1.20.4 +pkgrel=1 +pkgdesc="An easy-to-use database designer and user interface" +arch=('i686' 'x86_64') +url="http://www.glom.org/" +license=('GPL') +depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql') +makedepends=('intltool' 'gnome-doc-utils' 'python2-sphinx' 'boost') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('038d106313774832c56c61312bb387a54cd2ffff50e6c7e56e47bc98b8b8531b') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --with-postgres-utils=/usr/bin \ + --disable-scrollkeeper \ + --disable-update-mime-database \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/glom/glom.install b/community-staging/glom/glom.install new file mode 100644 index 000000000..1ad77f9aa --- /dev/null +++ b/community-staging/glom/glom.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} diff --git a/community-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD new file mode 100644 index 000000000..93fd45dc0 --- /dev/null +++ b/community-staging/smc/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 66950 2012-03-02 18:13:57Z lcarlier $ +# Maintainer: +# Contributor: Juergen Hoetzel +# Contributor: Kritoke + +pkgname=smc +pkgver=1.9 +pkgrel=15 +pkgdesc="Secret Maryo Chronicles" +arch=('i686' 'x86_64') +url="http://www.secretmaryo.org/" +license=('GPL3') +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') +makedepends=('autoconf' 'automake' 'boost') +source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 + smc-for-cegui-v0-7.diff + smc.desktop + smc.png) +md5sums=('75ab7826303c49aec25b052a8b90287f' + '51dfea21b741ad19df14e738df52f1cf' + '80fe208132ff41dd7677a53ee429ecdb' + 'efca7580e28748625eb676c9d24ee122') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # to remove when smc will be compatible with cegui-0.7.x + patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff" + # fix for boost-1.46 + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + ./autogen.sh + LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make install DESTDIR="$pkgdir" + # install some freedesktop.org compatibility + install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + + rm -rf "$pkgdir/usr/share/smc/" +} diff --git a/community-staging/smc/smc-for-cegui-v0-7.diff b/community-staging/smc/smc-for-cegui-v0-7.diff new file mode 100644 index 000000000..a99cbce6c --- /dev/null +++ b/community-staging/smc/smc-for-cegui-v0-7.diff @@ -0,0 +1,437 @@ +diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac +--- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200 ++++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100 +@@ -53,7 +53,7 @@ + AC_MSG_ERROR([SDL_ttf library not found])) + + # Check for the CEGUI library +-PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) ++PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0) + CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" + LIBS="$LIBS $CEGUI_LIBS" + +diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp +--- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 ++++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 +@@ -118,16 +118,10 @@ + return tmp; + } + +-void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const ++void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const + { + // draw text +- list_text->draw( position, alpha, clipper ); +-} +- +-void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const +-{ +- // draw text +- list_text->draw( cache, targetRect, zBase, alpha, clipper ); ++ list_text->draw( buffer, targetRect, alpha, clipper ); + } + + void cEditor_Item_Object :: Draw_Image( void ) +@@ -533,12 +527,12 @@ + if( editor_window->getXPosition().asRelative( 1 ) >= 0 ) + { + // Listbox dimension +- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley; +- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley; ++ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley; ++ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley; + // Vertical ScrollBar Position + float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley; + // font height +- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley; ++ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley; + + // draw items + for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ ) +diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h +--- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 ++++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 +@@ -62,8 +62,7 @@ + */ + virtual CEGUI::Size getPixelSize( void ) const; + // draw +- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const; +- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const; ++ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const; + // draw image + void Draw_Image( void ); + +diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp +--- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 ++++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 +@@ -265,7 +265,7 @@ + + + // align text +- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); ++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); + // fixme : Can't handle multiple lines of text + float text_width = font->getTextExtent( text ) * global_downscalex; + +@@ -1182,7 +1182,7 @@ + text_default->setText( gui_text ); + + // align text +- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); ++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); + float text_width = font->getTextExtent( gui_text ) * global_downscalex; + + text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) ); +@@ -1190,7 +1190,7 @@ + text_default->moveToFront(); + + // set window height +- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) ); ++ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) ); + + while( draw ) + { +diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp +--- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 ++++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 +@@ -444,13 +444,15 @@ + + if( pGuiSystem ) + { +- delete pGuiSystem; ++ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); ++ pGuiSystem->destroy(); + pGuiSystem = NULL; ++ delete rp; + } + + if( pGuiRenderer ) + { +- delete pGuiRenderer; ++ pGuiRenderer->destroy( *pGuiRenderer ); + pGuiRenderer = NULL; + } + +@@ -507,7 +509,7 @@ + } + case SDL_VIDEORESIZE: + { +- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast(ev->resize.w), static_cast(ev->resize.h) ) ); ++ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast(ev->resize.w), static_cast(ev->resize.h) ) ); + break; + } + case SDL_KEYDOWN: +diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp +--- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 ++++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 +@@ -946,7 +946,7 @@ + m_text_debug_text->setVisible( 1 ); + + // update position +- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); ++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); + float text_width = font->getTextExtent( gui_text ) * global_downscalex; + + if( text_width > 800.0f ) +diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp +--- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 ++++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 +@@ -432,17 +432,12 @@ + + void cMouseCursor :: Render( void ) const + { +- if( !m_active ) +- { ++ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr(); ++ ++ if ( m_active == mouse->isVisible() ) + return; +- } + +- // Render CEGUI Mouse +- pGuiRenderer->setQueueingEnabled( 0 ); +- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr(); +- mouse->setVisible( 1 ); +- mouse->draw(); +- mouse->setVisible( 0 ); ++ mouse->setVisible( m_active ); + } + + void cMouseCursor :: Update_Position( void ) +diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp +--- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 ++++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 +@@ -163,8 +163,8 @@ + editbox->setText( int_to_string( bg_color_2.blue ).c_str() ); + // preview window + CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" ); +- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 ); +- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 ); ++ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 ); ++ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 ); + + Update_BG_Colors( CEGUI::EventArgs() ); + +@@ -555,8 +555,8 @@ + + // set default rect + CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" ); +- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex; +- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley; ++ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex; ++ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley; + + if( !File_Exists( filename ) ) + { +diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp +--- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 ++++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 +@@ -1663,7 +1663,7 @@ + window_name->setText( name ); + window_name->setTooltipText( tooltip ); + // get text width +- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); ++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); + float text_width = 12 + font->getTextExtent( name ) * global_downscalex; + // all names should have the same width + if( text_width > m_editor_window_name_width ) +diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp +--- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 ++++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 +@@ -103,15 +103,15 @@ + + /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */ + +-cFake_Renderer :: cFake_Renderer( void ) +-{ +- d_identifierString = "Fake Renderer"; +-} ++//cFake_Renderer :: cFake_Renderer( void ) ++//{ ++// d_identifierString = "Fake Renderer"; ++//} + +-cFake_Renderer :: ~cFake_Renderer( void ) +-{ ++//cFake_Renderer :: ~cFake_Renderer( void ) ++//{ + +-} ++//} + + /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */ + +@@ -158,7 +158,7 @@ + std::string log_dump_dir = "/dev/null"; + #endif + // create fake system and renderer +- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir ); ++ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir ); + } + + void cVideo :: Delete_CEGUI_Fake( void ) const +@@ -166,7 +166,7 @@ + CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider(); + CEGUI::Renderer *renderer = pGuiSystem->getRenderer(); + +- delete pGuiSystem; ++ pGuiSystem->destroy(); + pGuiSystem = NULL; + delete renderer; + delete rp; +@@ -177,7 +177,7 @@ + // create renderer + try + { +- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h ); ++ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) ); + } + // catch CEGUI Exceptions + catch( CEGUI::Exception &ex ) +@@ -186,10 +186,10 @@ + exit( EXIT_FAILURE ); + } + +- /* create Resource Provider +- * no need to destroy it later since it is handled by the CEGUI renderer +- */ +- CEGUI::DefaultResourceProvider *rp = static_cast(pGuiRenderer->createResourceProvider()); ++ pGuiRenderer->enableExtraStateSettings(true); ++ ++ // create Resource Provider ++ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider; + + // set Resource Provider directories + rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" ); +@@ -215,7 +215,7 @@ + // create system + try + { +- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" ); ++ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" ); + } + // catch CEGUI Exceptions + catch( CEGUI::Exception &ex ) +@@ -242,7 +242,7 @@ + // load the scheme file, which auto-loads the imageset + try + { +- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" ); ++ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" ); + } + // catch CEGUI Exceptions + catch( CEGUI::Exception &ex ) +@@ -254,9 +254,7 @@ + // default mouse cursor + pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" ); + // force new mouse image +- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) ); +- // hide CEGUI mouse always because we render it manually +- CEGUI::MouseCursor::getSingleton().hide(); ++ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) ); + // default tooltip + pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" ); + // create default root window +@@ -553,7 +551,7 @@ + pFont->Restore_Textures(); + + // send new size to CEGUI +- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast(screen_w), static_cast(screen_h) ) ); ++ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast(screen_w), static_cast(screen_h) ) ); + + // check if CEGUI is initialized + bool cegui_initialized = pGuiSystem->getGUISheet() != NULL; +diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h +--- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 ++++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 +@@ -23,7 +23,7 @@ + #include "SDL_opengl.h" + // CEGUI + #include "CEGUI.h" +-#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h" ++#include + + namespace SMC + { +@@ -129,31 +129,100 @@ + EFFECT_IN_AMOUNT + }; + +-/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */ ++/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */ ++// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did... ++class cFake_GeometryBuffer : public CEGUI::GeometryBuffer ++{ ++ void draw() const {} ++ void setTranslation(const CEGUI::Vector3&) {} ++ void setRotation(const CEGUI::Vector3&) {} ++ void setPivot(const CEGUI::Vector3&) {} ++ void setClippingRegion(const CEGUI::Rect&) {} ++ void appendVertex(const CEGUI::Vertex&) {} ++ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {} ++ void setActiveTexture(CEGUI::Texture*) {} ++ void reset() {} ++ CEGUI::Texture* getActiveTexture() const { return 0; } ++ CEGUI::uint getVertexCount() const { return 0; } ++ CEGUI::uint getBatchCount() const { return 0; } ++ void setRenderEffect(CEGUI::RenderEffect*) {} ++ CEGUI::RenderEffect* getRenderEffect() { return 0; } ++}; + +-class cFake_Renderer : public CEGUI::Renderer ++class cFake_Texture : public CEGUI::Texture ++{ ++public: ++ cFake_Texture() : ++ m_size(1, 1), ++ m_scaling(1, 1) {} ++ ++ const CEGUI::Size& getSize() const { return m_size; } ++ const CEGUI::Size& getOriginalDataSize() const { return m_size; } ++ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; } ++ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {} ++ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {} ++ void saveToMemory(void*) {} ++ ++private: ++ CEGUI::Size m_size; ++ CEGUI::Vector2 m_scaling; ++}; ++ ++class cFake_RenderTarget : public CEGUI::RenderTarget + { + public: +- cFake_Renderer( void ); +- virtual ~cFake_Renderer( void ); ++ cFake_RenderTarget() : m_area(0, 0, 0, 0) {} ++ void draw(const CEGUI::GeometryBuffer&) {} ++ void draw(const CEGUI::RenderQueue&) {} ++ void setArea(const CEGUI::Rect&) {} ++ const CEGUI::Rect& getArea() const { return m_area; } ++ bool isImageryCache() const { return false; } ++ void activate() {} ++ void deactivate() {} ++ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {} ++ ++private: ++ CEGUI::Rect m_area; ++}; + +- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {}; +- virtual void doRender(void) {}; +- virtual void clearRenderList(void) {}; +- virtual void setQueueingEnabled(bool setting) {}; +- virtual CEGUI::Texture *createTexture(void) { return NULL; }; +- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; }; +- virtual CEGUI::Texture *createTexture(float size) { return NULL; }; +- virtual void destroyTexture(CEGUI::Texture* texture) {}; +- virtual void destroyAllTextures(void) {}; +- virtual bool isQueueingEnabled(void) const { return 0; }; +- virtual float getWidth(void) const { return 0; }; +- virtual float getHeight(void) const { return 0; }; +- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();}; +- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();}; +- virtual unsigned int getMaxTextureSize(void) const { return 0; }; +- virtual unsigned int getHorzScreenDPI(void) const { return 0; }; +- virtual unsigned int getVertScreenDPI(void) const { return 0; }; ++class cFake_Renderer : public CEGUI::Renderer ++{ ++public: ++ cFake_Renderer( void ) : ++ m_size(0, 0), ++ m_dpi(0, 0), ++ m_identifierString("Fake Renderer"), ++ m_root(m_target) {} ++ ~cFake_Renderer( void ) {} ++ ++ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; } ++ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; } ++ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {} ++ void destroyAllGeometryBuffers() {} ++ CEGUI::TextureTarget* createTextureTarget() { return 0; } ++ void destroyTextureTarget(CEGUI::TextureTarget*) {} ++ void destroyAllTextureTargets() {} ++ CEGUI::Texture& createTexture() { return m_texture; } ++ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; } ++ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; } ++ void destroyTexture(CEGUI::Texture&) {} ++ void destroyAllTextures() {} ++ void beginRendering() {} ++ void endRendering() {} ++ void setDisplaySize(const CEGUI::Size&) {} ++ const CEGUI::Size& getDisplaySize() const { return m_size; } ++ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; } ++ CEGUI::uint getMaxTextureSize() const { return 0; } ++ const CEGUI::String& getIdentifierString() const { return m_identifierString; } ++ ++private: ++ CEGUI::Size m_size; ++ CEGUI::Vector2 m_dpi; ++ CEGUI::String m_identifierString; ++ cFake_GeometryBuffer m_geometry; ++ cFake_Texture m_texture; ++ cFake_RenderTarget m_target; ++ CEGUI::RenderingRoot m_root; + }; + + /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */ diff --git a/community-staging/smc/smc.desktop b/community-staging/smc/smc.desktop new file mode 100644 index 000000000..6cfe5b018 --- /dev/null +++ b/community-staging/smc/smc.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Secret Maryo Chronicles +GenericName=Arcade Game +Exec=smc +Icon=smc.png +Terminal=false +Type=Application +Categories=Game;ArcadeGame;KidsGame; +StartupNotify=false \ No newline at end of file diff --git a/community-staging/smc/smc.png b/community-staging/smc/smc.png new file mode 100644 index 000000000..f02af1bfc Binary files /dev/null and b/community-staging/smc/smc.png differ diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index 4887297a5..7a34c23b4 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63896 2012-02-06 16:45:24Z tdziedzic $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 66946 2012-03-02 16:54:51Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski # Contributor: Mateusz Herych # Contributor: Jaroslaw Swierczynski pkgname=kadu -pkgver=0.11.0 +pkgver=0.11.1 pkgrel=1 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('480377508522fe088dd78452d06c5972') +md5sums=('30c239876fd0fd4eadb874c3cb2ebe10') build() { cd "$srcdir" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 201ae5471..33b7646d4 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64710 2012-02-18 00:19:36Z tdziedzic $ +# $Id: PKGBUILD 66966 2012-03-02 23:22:53Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -7,7 +7,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.6.11 +pkgver=0.6.12 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('2f554353e831b8a22e6a85c676374374') +md5sums=('a12766ae4003c9712927d1fa134ed9f6') build() { cd node-v${pkgver} diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index f358aa796..6e6d9fd1f 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,38 +1,48 @@ -# $Id: PKGBUILD 66535 2012-02-25 23:57:00Z lfleischer $ -# Maintainer: Kaiting Chen +# $Id: PKGBUILD 66970 2012-03-03 00:47:31Z seblu $ +# Maintainer: Sébastien Luttringer +# Contributor: Kaiting Chen # Contributor: Mark Smith pkgname=radvd -pkgver=1.8.2 -pkgrel=2 -pkgdesc='IPv6 Router Advertisement / Router Solicitation daemon' +pkgver=1.8.5 +pkgrel=1 +pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' license=('custom') depends=('glibc') arch=('i686' 'x86_64') -install=radvd.install -source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" 'radvd.rc.d') -md5sums=('ac8a862d2b232d25ea2622274a2da8a4' - '65a585f5850a1ac2a0c2c2a7096ec92a') +backup=('etc/radvd.conf' 'etc/conf.d/radvd') +source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" + "$pkgname.rc" + "$pkgname.conf" + "$pkgname.service") +sha1sums=('344c145bd29938b7eefb0210cf92bf18df3e191d' + '7b187db1f0ba2897cc07ea14233c079593b69ef0' + 'd7755ac7e752452e5ac92d2bfd970db00525902d' + 'd95dc4d650a086641d62bf42806669e0a407d1df') build() { cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ + ./configure --prefix=/usr --sysconfdir=/etc --with-pidfile=/run/radvd.pid \ --mandir=/usr/share/man - make } package() { cd ${pkgname}-${pkgver} + make DESTDIR="$pkgdir" install - make DESTDIR=$pkgdir install + # install default config + install -D -m 644 radvd.conf.example "$pkgdir/etc/radvd.conf" - install -Dm644 radvd.conf.example \ - $pkgdir/usr/share/doc/radvd/radvd.conf.example - install -Dm644 COPYRIGHT \ - $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT - install -Dm755 $srcdir/radvd.rc.d $pkgdir/etc/rc.d/radvd + # install license + install -D -m 644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" + + # install initscripts & systemd files + install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -D -m 644 ../$pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + install -D -m 644 ../$pkgname.service \ + "$pkgdir/lib/systemd/system/$pkgname.service" } + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/radvd/radvd.conf b/community/radvd/radvd.conf new file mode 100644 index 000000000..26cd410d1 --- /dev/null +++ b/community/radvd/radvd.conf @@ -0,0 +1,3 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +DAEMON_OPTS='--logmethod syslog' diff --git a/community/radvd/radvd.rc b/community/radvd/radvd.rc new file mode 100644 index 000000000..b5dc6e27b --- /dev/null +++ b/community/radvd/radvd.rc @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/${0##*/} + +NAME='IPv6 Router Advertisement Daemon' +DAEMON=/usr/sbin/radvd +PID=$(pidof -o %PPID $DAEMON) + +case "$1" in + start) + stat_busy "Starting $NAME daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0 + stat_fail + ;; + stop) + stat_busy "Stopping $NAME daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0 + stat_fail + ;; + restart) + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; +esac + +exit 1 + +# vim:set ts=2 sw=2 ft=sh noet: diff --git a/community/radvd/radvd.service b/community/radvd/radvd.service new file mode 100644 index 000000000..47a5f7f67 --- /dev/null +++ b/community/radvd/radvd.service @@ -0,0 +1,8 @@ +[Unit] +Description=IPv6 Router Advertisement Daemon + +[Service] +ExecStart=/usr/sbin/radvd --nodaemon --logmethod stderr + +[Install] +WantedBy=multi-user.target diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 98f7886ad..84ebbed4c 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60395 2011-12-13 10:24:06Z plewis $ +# $Id: PKGBUILD 66942 2012-03-02 15:35:36Z andrea $ # Maintainer: Peter Lewis # Contributor: Andrea Scarpino # Contributor: Panagiotis Papadopoulos pkgname=rekonq -pkgver=0.8.1 +pkgver=0.9.0 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') @@ -13,10 +13,15 @@ license=('GPL') depends=('kdebase-keditbookmarks') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('907c3bd299ee95806d337b749c74531441e0d205055998678337266ccc6c9b7f') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'fix-build.patch') +sha256sums=('2dc4f9b041bba89937c3278f53cbcc61964d3e2e2279dd44000c19902459b6cc' + '3ef9f0e6dc37f479c7cc38d84f6a6366a499f371610df01bcdaff9f4b71d246e') build(){ + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fix-build.patch + cd ${srcdir} mkdir build cd build diff --git a/community/rekonq/fix-build.patch b/community/rekonq/fix-build.patch new file mode 100644 index 000000000..1a401ce2c --- /dev/null +++ b/community/rekonq/fix-build.patch @@ -0,0 +1,11 @@ +--- rekonq-0.9.0/doc/nl/index.docbook~ 2012-03-02 15:31:21.730372412 +0000 ++++ rekonq-0.9.0/doc/nl/index.docbook 2012-03-02 15:31:48.780152894 +0000 +@@ -82,7 +82,7 @@ + > + +-&ged.vertaald;&Freek.de.Kruijf; ++&Freek.de.Kruijf; + + &FDLNotice; diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 1630b5894..bd1b03d0e 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62568 2012-01-21 14:00:13Z ttopper $ +# $Id: PKGBUILD 66956 2012-03-02 19:09:35Z ttopper $ # Maintainer: Thorsten Töpper # Contributor: Alexander Fehr pkgname=roxterm -pkgver=2.4.2 -pkgrel=2 +pkgver=2.5.2 +pkgrel=1 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64') url="http://roxterm.sourceforge.net/" @@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm') makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg') install=roxterm.install source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2") -sha1sums=('663f5ffedebde550317cff4b3e61d2772881cd2f') -md5sums=('7c3bb1471f814a8bfdfcf169ad18e425') +sha1sums=('32d18b8a12f1711dc7bb5ae52300dc9eb6869e09') +md5sums=('d879ba09c4d72546fca2e2e5f18eac07') build() { diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD index 53eb06d0b..adf769587 100644 --- a/core/syslinux/PKGBUILD +++ b/core/syslinux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144967 2011-12-12 09:45:24Z thomas $ +# $Id: PKGBUILD 151789 2012-03-02 23:26:36Z pierre $ # Maintainer: Thomas Bächler # Maintainer: Tobias Powalowski pkgname=syslinux pkgver=4.05 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE" url="http://syslinux.zytor.com/" @@ -12,7 +12,7 @@ license=('GPL2') depends=('perl' 'glibc') optdepends=('perl-passwd-md5: For md5pass' 'perl-digest-sha1: For sha1pass' - 'mtools: For mkdiskimage and syslinux' + 'mtools: For mkdiskimage and fat support' ) makedepends=('nasm') backup=('boot/syslinux/syslinux.cfg') @@ -23,8 +23,8 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux-install_update) md5sums=('82299242418385da1274c9479a778cb2' '1528c376e43f0eaccaa80d8ad1bc13b4' - '4dc27d8ab3802f8e50f3dda28168ce6d' - 'b5b4953c0a5a01cd16441402f6321765') + '832595501944fbcabcdc1207f4724fe7' + '680750f73dc2e587ac567d057d485813') build() { # Do not try to build syslinux with our default LDFLAGS, it will fail @@ -46,4 +46,6 @@ package() { # Install the installation and update script # This script is maintained at git://gist.github.com/772138.git install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update + # move extlinux binary to /usr/sbin + mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux } diff --git a/core/syslinux/syslinux-install_update b/core/syslinux/syslinux-install_update index f7cd123e1..cd1baa572 100644 --- a/core/syslinux/syslinux-install_update +++ b/core/syslinux/syslinux-install_update @@ -28,7 +28,7 @@ shopt -s nullglob libpath="/usr/lib/syslinux" bootpath="/boot/syslinux" -extlinux="/sbin/extlinux" +extlinux="/usr/sbin/extlinux" autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com) @@ -357,12 +357,6 @@ update() { fi } -# Make sure only root can run our script -if (( $(id -u) != 0 )); then - echo "This script must be run as root" 1>&2 - exit 1 -fi - if (( $# == 0 )); then usage exit 1 @@ -378,8 +372,7 @@ while getopts "c:uihmas" opt; do fi ;; h) - usage - exit 0 + USAGE="True" ;; i) INSTALL="True" @@ -408,6 +401,17 @@ while getopts "c:uihmas" opt; do esac done +if [[ $USAGE ]]; then + usage + exit 0 +fi + +# Make sure only root can run our script +if (( $(id -u) != 0 )); then + echo "This script must be run as root" 1>&2 + exit 1 +fi + # Display Usage Information if both Install and Update are passed if [[ $INSTALL && $UPDATE ]]; then usage diff --git a/core/syslinux/syslinux.cfg b/core/syslinux/syslinux.cfg index 02127d21d..5a588f58c 100644 --- a/core/syslinux/syslinux.cfg +++ b/core/syslinux/syslinux.cfg @@ -20,7 +20,7 @@ # The wiki provides further configuration examples DEFAULT arch -PROMPT 0 # Change to 1 if you do not want to use a menu +PROMPT 0 # Set to 1 if you always want to display the boot: prompt TIMEOUT 50 # You can create syslinux keymaps with the keytab-lilo tool #KBDMAP de.ktl diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index b45dcba2c..b6e815c5e 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 147702 2012-01-27 07:30:51Z tpowa $ +# $Id: PKGBUILD 151749 2012-03-02 07:36:36Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=alsa-utils pkgver=1.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -14,15 +14,13 @@ makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 alsa - alsaconf.patch alsa.conf.d 90alsa) backup=(etc/conf.d/alsa) build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ../alsaconf.patch - ./configure --prefix=/usr --with-systemdsystemunitdir=/lib/systemd/system + ./configure --prefix=/usr --disable-alsaconf --with-systemdsystemunitdir=/lib/systemd/system make } @@ -37,6 +35,5 @@ package() { } md5sums=('f81f9dcb9a014fd32cb3a70066a5b9a9' '2ba1a1cbf653bf1a69f8a720fd6549da' - '7521bf20f5b3501a510ec4462ae4a934' '4c8ae9f976c7df5e271a4cb91ccc7767' '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index 279bf9f78..b5043885f 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 148030 2012-01-30 07:42:40Z tpowa $ +# $Id: PKGBUILD 151756 2012-03-02 08:44:51Z tpowa $ # Maintainer: Tobias Powalowski pkgname=cifs-utils pkgver=5.3 -pkgrel=1 +pkgrel=2 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64) url="http://wiki.samba.org/index.php/LinuxCIFS_utils" license=('GPL') -depends=('libcap-ng' 'keyutils' 'krb5' 'talloc') +depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient') source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2) -# deinstall smbclient first! build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD index 72a624c20..650259bc1 100644 --- a/extra/cvsps/PKGBUILD +++ b/extra/cvsps/PKGBUILD @@ -1,24 +1,45 @@ -# $Id: PKGBUILD 149335 2012-02-06 20:45:16Z stephane $ +# $Id: PKGBUILD 151779 2012-03-02 17:28:27Z dan $ # Maintainer: # Contributor: Jeff 'codemac' Mickey pkgname=cvsps -pkgver=2.1 -pkgrel=4 +pkgver=2.2b1 +pkgrel=1 pkgdesc="Generating 'patchset' information from a CVS repository" url="http://www.cobite.com/cvsps/" license=('GPL') arch=('i686' 'x86_64') depends=('zlib') -source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('bde2110ed9f5d14de8f8cb04e9d596fe') +source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz" + call-cvs-q-option.patch + cvsps-2.2b1-bufferoverflow.patch + cvsps-2.2b1-dynamic-logbuf.patch + cvsps-2.2b1-man.patch + seperate-CPPFLAGS.patch + use-INADDR_NONE-define.patch + use-__linux__-define.patch + use-offsetof-macro.patch) +md5sums=('997580e8e283034995b9209076858c68' + '06324c5e3c321126b76dc97fc6c00b34' + '2910012a11a24d5e4192cf9eae7dd259' + '970566460e72cb159426965d6e5763b3' + 'f9d2ee40e52ecd5096fa9a885418eee1' + '6baafbd7512aa52e1b83ed0bead32a6e' + 'a3a81481c07dcc676f5a82ae07e8ee89' + '9e2763315cbda02665c47827d38df459' + '8f7e6f09f42f76deeefe24bbfa509150') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + for file in ${source[@]}; do + if [[ $file == *.patch ]]; then + patch -Np1 < ../$file + fi + done make prefix=/usr } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir/usr" install } diff --git a/extra/cvsps/call-cvs-q-option.patch b/extra/cvsps/call-cvs-q-option.patch new file mode 100644 index 000000000..a754b7c60 --- /dev/null +++ b/extra/cvsps/call-cvs-q-option.patch @@ -0,0 +1,34 @@ +From 49d7a3e44b54f18b0e2762d8dbb087ad4c2f0276 Mon Sep 17 00:00:00 2001 +From: Yann Dirson +Date: Thu, 15 Jun 2006 09:48:08 +0200 +Subject: [PATCH] Call cvs with -q flag when fetching the log + +This gets rid of the neverending output polution cvs sends to stderr, +which is mostly useless and has a strong potential to hide real problem +reports +--- + cvsps.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cvsps.c b/cvsps.c +index d94dfe0..be700ba 100644 +--- a/cvsps.c ++++ b/cvsps.c +@@ -301,12 +301,12 @@ static void load_from_cvs() + * which is necessary to fill in the pre_rev stuff for a + * PatchSetMember + */ +- snprintf(cmd, BUFSIZ, "cvs %s %s %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff); ++ snprintf(cmd, BUFSIZ, "cvs %s %s -q %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff); + } + else + { + date_str[0] = 0; +- snprintf(cmd, BUFSIZ, "cvs %s %s %s %s", compress_arg, norc, ltype, use_rep_buff); ++ snprintf(cmd, BUFSIZ, "cvs %s %s -q %s %s", compress_arg, norc, ltype, use_rep_buff); + } + + debug(DEBUG_STATUS, "******* USING CMD %s", cmd); +-- +1.6.5.GIT + diff --git a/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch b/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch new file mode 100644 index 000000000..2a82cd4e0 --- /dev/null +++ b/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch @@ -0,0 +1,65 @@ +--- cvsps-2.2b1/cvsps.c 2010-09-07 18:13:42.760727491 +0200 ++++ cvsps-2.2b1_/cvsps.c 2010-09-07 18:05:11.083729441 +0200 +@@ -1065,17 +1065,16 @@ static CvsFile * parse_file(const char * + { + CvsFile * retval; + char fn[PATH_MAX]; +- int len = strlen(buff + 10); ++ size_t len = strlen(buff + 10); + char * p; + + /* once a single file has been parsed ok we set this */ + static int path_ok; +- ++ + /* chop the ",v" string and the "LF" */ + len -= 3; + memcpy(fn, buff + 10, len); + fn[len] = 0; +- + if (strncmp(fn, strip_path, strip_path_len) != 0) + { + /* if the very first file fails the strip path, +@@ -1096,10 +1095,10 @@ static CvsFile * parse_file(const char * + + while ((p = strstr(p, repository_path))) + lastp = p++; +- ++ + if (lastp) + { +- int len = strlen(repository_path); ++ size_t len = strlen(repository_path); + memcpy(strip_path, fn, lastp - fn + len + 1); + strip_path_len = lastp - fn + len + 1; + strip_path[strip_path_len] = 0; +@@ -1114,16 +1113,26 @@ static CvsFile * parse_file(const char * + * + * For now just ignore such files + */ +- debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", ++ debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", + fn, strip_path); + return NULL; + } + + ok: +- path_ok = 1; +- ++ /* ++ fix for rhbz#576076 ++ ./cvsps --norc -q --cvs-direct -u -A --root :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot NSS ++ */ ++ if(len <= strip_path_len) ++ { ++ debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", ++ fn, strip_path); ++ return NULL; ++ } + /* remove from beginning the 'strip_path' string */ + len -= strip_path_len; ++ path_ok = 1; ++ + memmove(fn, fn + strip_path_len, len); + fn[len] = 0; + diff --git a/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch b/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch new file mode 100644 index 000000000..03e4e7672 --- /dev/null +++ b/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch @@ -0,0 +1,133 @@ +# From: http://ydirson.free.fr/soft/git/cvsps.git + +commit 76a9c2aaa0d2957de0bc8f0c0b994abfd1645a50 +Author: David D. Kilzer +Date: Mon Jun 20 01:04:34 2005 +0200 + + Dynamically allocate the log buffer to prevent warning messages + + On anoncvs.opensource.apple.com (Apple's anonymous CVS server for + WebKit), some very long log entries were included in CVS. I got tired + of cvsps-2.1 truncating them, so I made the 'logbuff' buffer be + dynamically allocated. + +diff --git i/cache.c w/cache.c +index 4c51cf7..01a8ed3 100644 +--- i/cache.c ++++ w/cache.c +@@ -108,10 +108,19 @@ time_t read_cache() + int tag_flags = 0; + char branchbuff[LOG_STR_MAX] = ""; + int branch_add = 0; +- char logbuff[LOG_STR_MAX] = ""; ++ int logbufflen = LOG_STR_MAX + 1; ++ char * logbuff = malloc(logbufflen); + time_t cache_date = -1; + int read_version; + ++ if (logbuff == NULL) ++ { ++ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen); ++ exit(1); ++ } ++ ++ logbuff[0] = 0; ++ + if (!(fp = cache_open("r"))) + goto out; + +@@ -299,8 +308,19 @@ time_t read_cache() + else + { + /* Make sure we have enough in the buffer */ +- if (strlen(logbuff)+strlen(buff)= LOG_STR_MAX) ++ { ++ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); ++ char * newlogbuff = realloc(logbuff, logbufflen); ++ if (newlogbuff == NULL) ++ { ++ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen); ++ exit(1); ++ } ++ logbuff = newlogbuff; ++ } ++ strcat(logbuff, buff); + } + break; + case CACHE_NEED_PS_MEMBERS: +@@ -332,6 +352,7 @@ time_t read_cache() + out_close: + fclose(fp); + out: ++ free(logbuff); + return cache_date; + } + +diff --git i/cvsps.c w/cvsps.c +index f0e7d29..db28d7c 100644 +--- i/cvsps.c ++++ w/cvsps.c +@@ -269,7 +269,8 @@ static void load_from_cvs() + PatchSetMember * psm = NULL; + char datebuff[26]; + char authbuff[AUTH_STR_MAX]; +- char logbuff[LOG_STR_MAX + 1]; ++ int logbufflen = LOG_STR_MAX + 1; ++ char * logbuff = malloc(logbufflen); + int loglen = 0; + int have_log = 0; + char cmd[BUFSIZ]; +@@ -277,6 +278,12 @@ static void load_from_cvs() + char use_rep_buff[PATH_MAX]; + char * ltype; + ++ if (logbuff == NULL) ++ { ++ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen); ++ exit(1); ++ } ++ + if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG)) + { + ltype = "rlog"; +@@ -484,25 +491,22 @@ static void load_from_cvs() + */ + if (have_log || !is_revision_metadata(buff)) + { +- /* if the log buffer is full, that's it. +- * +- * Also, read lines (fgets) always have \n in them +- * (unless truncation happens) +- * which we count on. So if truncation happens, +- * be careful to put a \n on. +- * +- * Buffer has LOG_STR_MAX + 1 for room for \0 if +- * necessary +- */ +- if (loglen < LOG_STR_MAX) ++ /* If the log buffer is full, try to reallocate more. */ ++ if (loglen < logbufflen) + { + int len = strlen(buff); + +- if (len >= LOG_STR_MAX - loglen) ++ if (len >= logbufflen - loglen) + { +- debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log"); +- len = LOG_STR_MAX - loglen; +- buff[len - 1] = '\n'; ++ debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename); ++ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); ++ char * newlogbuff = realloc(logbuff, logbufflen); ++ if (newlogbuff == NULL) ++ { ++ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen); ++ exit(1); ++ } ++ logbuff = newlogbuff; + } + + debug(DEBUG_STATUS, "appending %s to log", buff); diff --git a/extra/cvsps/cvsps-2.2b1-man.patch b/extra/cvsps/cvsps-2.2b1-man.patch new file mode 100644 index 000000000..3e6816fd5 --- /dev/null +++ b/extra/cvsps/cvsps-2.2b1-man.patch @@ -0,0 +1,29 @@ +diff -up cvsps-2.2b1/cvsps.1~ cvsps-2.2b1/cvsps.1 +--- cvsps-2.2b1/cvsps.1~ 2008-04-02 04:18:44.000000000 +0300 ++++ cvsps-2.2b1/cvsps.1 2010-05-18 21:10:39.000000000 +0300 +@@ -11,7 +11,7 @@ to a collection of files, and all commit + single 'cvs commit' command). This information is valuable to seeing the + big picture of the evolution of a cvs project. While cvs tracks revision + information, it is often difficult to see what changes were committed +-'atomically' to the repository. ++\'atomically' to the repository. + .SH OPTIONS + .TP + .B \-h +@@ -83,7 +83,7 @@ some hacks which are not generally appli + disable the use of rlog internally. Note: rlog is + required for stable PatchSet numbering. Use with care. + .TP +-.B \-\-diffs\-opts