rpms/bitlbee/devel bitlbee-1.0.3-cflags.patch, NONE, 1.1 bitlbee-1.0.3-socklen.patch, NONE, 1.1 bitlbee.spec, NONE, 1.1 bitlbee.xinetd, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Robert Scheck (robert)
fedora-extras-commits at redhat.com
Tue Oct 24 07:41:11 UTC 2006
Author: robert
Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2928/devel
Modified Files:
.cvsignore sources
Added Files:
bitlbee-1.0.3-cflags.patch bitlbee-1.0.3-socklen.patch
bitlbee.spec bitlbee.xinetd
Log Message:
auto-import bitlbee-1.0.3-5 on branch devel from bitlbee-1.0.3-5.src.rpm
bitlbee-1.0.3-cflags.patch:
--- NEW FILE bitlbee-1.0.3-cflags.patch ---
Bug #171: [PATCH] Environment variable CFLAGS isn't honored
--------------------------------------+-------------------------------------
Reporter: robert at fedoraproject.org | Owner:
Type: defect | Status: new
Priority: normal | Milestone:
Component: BitlBee | Version: 1.0.3
Keywords: | Irc_client: Client-independent
Os: Linux | Os_version:
--------------------------------------+-------------------------------------
BitlBee currently doesn't honor passed CFLAGS, neither in 'CFLAGS="foo"
./configure' nor at 'make CFLAGS="foo"'. Last one will break BitlBee while
compiling completely. Following patch resolves the issue (especially for
vendors like Fedora, Mandrake etc). Thanks to wilmer and lucumo for
figgering out a suitable and working solution.
Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/171
--- bitlbee-1.0.3/configure 2006-06-24 16:00:43.000000000 +0200
+++ bitlbee-1.0.3/configure.rsc 2006-06-26 16:03:59.000000000 +0200
@@ -111,7 +111,11 @@
echo 'DEBUG=1' >> Makefile.settings
echo '#define DEBUG' >> config.h
else
- echo 'CFLAGS=-O3' >> Makefile.settings
+ if [ -n "$CFLAGS" ]; then
+ echo CFLAGS="$CFLAGS" >> Makefile.settings
+ else
+ echo CFLAGS="-O3" >> Makefile.settings
+ fi
fi
echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
bitlbee-1.0.3-socklen.patch:
--- NEW FILE bitlbee-1.0.3-socklen.patch ---
Bug #200: bitlbee.c:41: warning: passing argument 3 of 'accept' from
incompatible pointer type
--------------------------------------+-------------------------------------
Reporter: anonymous | Owner:
Type: defect | Status: new
Priority: minor | Milestone:
Component: BitlBee | Version: 1.0.3
Keywords: | Irc_client: Client-independent
Os: Public server | Os_version: Fedora Core 4
--------------------------------------+-------------------------------------
on x86_64 I get:
bitlbee.c:41: warning: passing argument 3 of 'accept' from incompatible
pointer type
This is because the type for size has been set to size_t instead of socklen_t.
Setting it to socklen_t resolved this for me.
paul at cypherpunks.ca
Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/200
--- bitlbee-1.0.3/bitlbee.c 2006-06-24 16:00:43.000000000 +0200
+++ bitlbee-1.0.3/bitlbee.c.socklen 2006-09-23 22:42:59.000000000 +0200
@@ -35,7 +35,7 @@
gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data )
{
- size_t size = sizeof( struct sockaddr_in );
+ socklen_t size = sizeof( struct sockaddr_in );
struct sockaddr_in conn_info;
int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info,
&size );
--- NEW FILE bitlbee.spec ---
Summary: IRC to other chat networks gateway
Name: bitlbee
Version: 1.0.3
Release: 5%{?dist}
License: GPL
Group: System Environment/Daemons
URL: http://www.bitlbee.org/
Source0: http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
Source1: bitlbee.xinetd
Patch0: bitlbee-1.0.3-cflags.patch
Patch1: bitlbee-1.0.3-socklen.patch
Requires: xinetd
Requires(pre): /usr/sbin/useradd
Requires(preun): /sbin/service
BuildRequires: glib2-devel, libxslt
%if 0%{?rhl}%{?fedora}%{?rhel}
BuildRequires: gnutls-devel
%else
BuildRequires: openssl-devel
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Bitlbee is an IRC to other chat networks gateway. Bitlbee can be used as
an IRC server which forwards everything you say to people on other chat
networks like MSN/ICQ/Jabber.
%prep
%setup -q
%patch0 -p1 -b .cflags
%patch1 -p1 -b .socklen
perl -pi.make -e '
s|\$\(BINDIR\)|\$(sbindir)|g;
s|\$\(DATADIR\)|\$(datadir)/%{name}|g;
s|\$\(ETCDIR\)|\$(sysconfdir)/%{name}|g;
s|\$\(MANDIR\)|\$(mandir)|g;
' Makefile */Makefile */*/Makefile
%build
CFLAGS="$RPM_OPT_FLAGS" ./configure \
--prefix=%{_prefix} \
--bindir=%{_sbindir} \
--etcdir=%{_sysconfdir}/%{name} \
--mandir=%{_mandir} \
--datadir=%{_datadir}/%{name} \
--config=%{_localstatedir}/lib/%{name} \
--strip=0 \
%if 0%{?rhl}%{?fedora}%{?rhel}
--ssl=gnutls
%else
--ssl=openssl
%endif
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib/%{name},%{_mandir}/man8}
install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
install -D -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
%pre
%{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/%{name} -M -c "BitlBee User" %{name} > /dev/null 2>&1 || :
%preun
if [ $1 -eq 0 ]; then
/sbin/service xinetd condrestart > /dev/null 2>&1 || :
fi
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc COPYING doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
%doc doc/user-guide/*.xml doc/user-guide/user-guide.txt
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
%{_sbindir}/%{name}
%{_datadir}/%{name}/
%{_mandir}/man?/%{name}*
%attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
%changelog
* Sat Oct 21 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-5
- Create a bitlbee user and condrestart xinetd instead of reload
* Fri Aug 04 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-4
- Switched to gnutls per default for SSL support (#196591 #c12)
* Mon Jun 26 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-3
- Added patch for using CFLAGS env (#196591 #c4, upstream #171)
* Sun Jun 25 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-2
- Changes to match with Fedora Packaging Guidelines (#196591)
* Sun Jun 25 2006 Robert Scheck <robert at fedoraproject.org> 1.0.3-1
- Upgrade to 1.0.3
* Sun Apr 02 2006 Robert Scheck <robert at fedoraproject.org> 1.0.2-1
- Upgrade to 1.0.2
* Sun Jan 15 2006 Robert Scheck <robert at fedoraproject.org> 1.0.1-1
- Upgrade to 1.0.1
* Wed Dec 28 2005 Robert Scheck <robert at fedoraproject.org> 1.0-2
- Rebuilt against gcc 4.1
* Mon Dec 05 2005 Robert Scheck <robert at fedoraproject.org> 1.0-1
- Upgrade to 1.0
* Sat Nov 12 2005 Robert Scheck <robert at fedoraproject.org> 0.92-4
- Rebuilt against openssl 0.9.8a
* Sun Aug 28 2005 Robert Scheck <robert at fedoraproject.org> 0.92-3
- Added patch, that allows specifying the Jabber server manually
- Don't start bitlbee per default as xinetd service
* Sun Jul 03 2005 Robert Scheck <robert at fedoraproject.org> 0.92-2
- Added patch giving ICQ/AIM support for typing notifications
* Fri Jul 01 2005 Robert Scheck <robert at fedoraproject.org> 0.92-1
- Upgrade to 0.92
- Initial spec file for Fedora Core
--- NEW FILE bitlbee.xinetd ---
# default: off
# description: bitlbee is an IRC gateway to other IM networks.
service ircd
{
disable = yes
socket_type = stream
protocol = tcp
wait = no
user = bitlbee
bind = 127.0.0.1
server = /usr/sbin/bitlbee
type = UNLISTED
port = 6667
log_on_failure += USERID
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 Oct 2006 07:39:56 -0000 1.1
+++ .cvsignore 24 Oct 2006 07:40:41 -0000 1.2
@@ -0,0 +1 @@
+bitlbee-1.0.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 Oct 2006 07:39:56 -0000 1.1
+++ sources 24 Oct 2006 07:40:41 -0000 1.2
@@ -0,0 +1 @@
+e46682d54cbd6265dd4436b3b6838d63 bitlbee-1.0.3.tar.gz
More information about the scm-commits
mailing list