I have made the following changes intended for : CE:Apps / f-irc Please review and accept ASAP - BOSS has already processed this request and suggests ??? See the "Messages from BOSS" section below
https://build.pub.meego.com/request/show/2682 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 2682: Messages from BOSS: None State: new 2011-10-24T18:57:55 bossbot Reviews: from bossbot :BOSS suggests accepting this review. See email for more details. BOSS accepted this review because: Target repo CE_Apps_armv7hl found. accepted on No date Changes: submit: Project:DE:Trunk:Testing:1.3 / f-irc -> CE:Apps / f-irc Index: f-irc.yaml =================================================================== --- f-irc.yaml (revision 0) +++ f-irc.yaml (revision 5fa328c31f9a75f08928af0766fba627) @@ -0,0 +1,29 @@ +Name: f-irc +Summary: f-irc +Version: 0.0.30 +Release: 1 +Group: Applications/Internet +License: GPLv2 +URL: http://www.vanheusden.com/fi/ +Sources: + - "fi-%{version}.tgz" +Patches: + - fi-0.0.30-install-fix.patch + - fi-0.0.30-gplv2-license-confirmation.patch + - fi-0.0.30-build_warnings.patch + - fi-0.0.30-config-file-creation.patch +Description: terminal based irc client +PkgConfigBR: + - ncurses + - panel +Requires: + - xterm +Files: + - "%{_bindir}/f-irc" + - "%{_datadir}/applications/f-irc.desktop" + - "%config %{_sysconfdir}/firc.conf" + - "%config %{_sysconfdir}/firc.theme" + +Configure: none +Builder: make +NoAutoLocale: true Index: f-irc.spec =================================================================== --- f-irc.spec (revision 0) +++ f-irc.spec (revision 5fa328c31f9a75f08928af0766fba627) @@ -0,0 +1,81 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.22git +# +# >> macros +# << macros + +Name: f-irc +Summary: f-irc +Version: 0.0.30 +Release: 1 +Group: Applications/Internet +License: GPLv2 +URL: http://www.vanheusden.com/fi/ +Source0: fi-%{version}.tgz +Source100: f-irc.yaml +Patch0: fi-0.0.30-install-fix.patch +Patch1: fi-0.0.30-gplv2-license-confirmation.patch +Patch2: fi-0.0.30-build_warnings.patch +Patch3: fi-0.0.30-config-file-creation.patch +Requires: xterm +BuildRequires: pkgconfig(ncurses) +BuildRequires: pkgconfig(panel) +BuildRequires: desktop-file-utils + + +%description +terminal based irc client + + + +%prep +%setup -q -n fi-%{version} + +# fi-0.0.30-install-fix.patch +%patch0 -p1 +# fi-0.0.30-gplv2-license-confirmation.patch +%patch1 -p1 +# fi-0.0.30-build_warnings.patch +%patch2 -p1 +# fi-0.0.30-config-file-creation.patch +%patch3 -p1 +# >> setup +# << setup + +%build +# >> build pre +# << build pre + + +make %{?jobs:-j%jobs} + +# >> build post +# << build post +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install + +# >> install post +# << install post +desktop-file-install --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/*.desktop + + + + + + +%files +%defattr(-,root,root,-) +%{_bindir}/f-irc +%{_datadir}/applications/f-irc.desktop +%config %{_sysconfdir}/firc.conf +%config %{_sysconfdir}/firc.theme +# >> files +# << files + + Index: fi-0.0.30-config-file-creation.patch =================================================================== --- fi-0.0.30-config-file-creation.patch (revision 0) +++ fi-0.0.30-config-file-creation.patch (revision 5fa328c31f9a75f08928af0766fba627) @@ -0,0 +1,817 @@ +diff -Naur fi-0.0.30-orig2//config.c fi-0.0.30/config.c +--- fi-0.0.30-orig2//config.c 2010-07-12 23:45:18.000000000 +0300 ++++ fi-0.0.30/config.c 2011-08-16 14:03:17.056526120 +0300 +@@ -9,6 +9,7 @@ + #include <panel.h> + #include <ncurses.h> + #include <ctype.h> ++#include <dirent.h> + + #include "gen.h" + #include "error.h" +@@ -32,55 +33,72 @@ + + char *ignore_file = "firc.ignore"; + +-void load_ignore_list(char *file) ++#define MAX_CHANNEL_LIST_SIZE 1000 ++ ++int load_ignore_list(char *file) + { +- int fd = open(file, O_RDONLY); ++ int fd; ++ int ret_val; ++ ++ ret_val = 0; ++ fd = open(file, O_RDONLY); + if (fd == -1) + { +- error_exit("Cannot open ignore file %s", file); ++ fprintf(stderr, " Warning, if you want to ignore messages from some users, consider adding ignore file: %s.\n", file); ++ /*error_exit("Cannot open ignore file %s\n", file); */ + } ++ else { ++ for(;;) ++ { ++ char *space; ++ char *line = read_line_fd(fd); + +- for(;;) +- { +- char *space; +- char *line = read_line_fd(fd); +- +- if (!line) break; +- if (strlen(line) == 0) break; ++ if (!line) break; ++ if (strlen(line) == 0) break; + +- space = strchr(line, ' '); +- if (space) +- { +- *space = 0x00; +- ignores = myrealloc(ignores, sizeof(ignore) * (n_ignores + 1), "ignore list"); +- ignores[n_ignores].channel = mystrdup(line, "ignores: channel"); +- space++; +- while(*space == ' ') space++; +- ignores[n_ignores].nick = mystrdup(space, "ignores: nick"); +- n_ignores++; ++ space = strchr(line, ' '); ++ if (space) ++ { ++ *space = 0x00; ++ ignores = myrealloc(ignores, sizeof(ignore) * (n_ignores + 1), "ignore list"); ++ ignores[n_ignores].channel = mystrdup(line, "ignores: channel"); ++ space++; ++ while(*space == ' ') space++; ++ ignores[n_ignores].nick = mystrdup(space, "ignores: nick"); ++ n_ignores++; ++ } ++ else { ++ fprintf(stderr, "'ignore' missing parameter: must be 'channel nick'"); ++ ret_val = -1; ++ break; ++ } ++ myfree(line); + } +- else +- error_exit("'ignore' missing parameter: must be 'channel nick'"); +- +- myfree(line); ++ close(fd); + } +- +- close(fd); ++ return ret_val; + } + +-int load_config(char *file) ++static int load_config_file(char *file) + { + char *description = NULL, *server = NULL, *username = NULL, *password = NULL, *nickname = NULL, *user_complete_name = NULL; + int server_index = -1; + int fd = open(file, O_RDONLY); ++ int err_flg; ++ char *theme_path; ++ ++ highlight = NULL; ++ user_complete_name = NULL; + if (fd == -1) + { +- if (errno == ENOENT) ++ if (errno == ENOENT) { ++ /*fprintf(stderr, "Could not find configuration file: %s\n\n", file); */ + return -1; +- +- error_exit("Cannot open config file %s", file); ++ } ++ fprintf(stderr, "Cannot open config file %s", file); ++ return -1; + } +- ++ fprintf(stderr, "Configuration file found: %s\n Trying to load configuration file\n", file); + for(;;) + { + char *line = read_line_fd(fd); +@@ -99,8 +117,10 @@ + continue; + + is = strchr(line, '='); +- if (!is) +- error_exit("config: line is missing either command or parameter! (%s)", line); ++ if (!is) { ++ fprintf(stderr, "config: line is missing either command or parameter! (%s)", line); ++ return -2; ++ } + + /* find parameter */ + par = is + 1; +@@ -143,6 +163,18 @@ + else if (strcmp(cmd, "username") == 0) + { + username = mystrdup(par, "username"); ++ if ((username != NULL) && (strlen(username) > 0)) { ++ if (highlight == NULL) { ++ highlight = mystrdup(username, "highlight"); ++ } ++ if (user_complete_name == NULL) { ++ user_complete_name = mystrdup(username, "fullname"); ++ } ++ } ++ else { ++ fprintf(stderr, " Error, could not load configuration file, 'username' not defined: %s\n\n", file); ++ return -2; ++ } + } + else if (strcmp(cmd, "password") == 0) + { +@@ -151,10 +183,22 @@ + else if (strcmp(cmd, "nick") == 0) + { + nickname = mystrdup(par, "nick"); ++ if ((nickname != NULL) && (strlen(nickname) > 0)) { ++ if (highlight == NULL) { ++ highlight = mystrdup(nickname, "highlight"); ++ } ++ if (user_complete_name == NULL) { ++ user_complete_name = mystrdup(nickname, "fullname"); ++ } ++ } ++ else { ++ fprintf(stderr, " Error, could not load configuration file, 'nick' not defined: %s\n\n", file); ++ return -3; ++ } + } +- else if (strcmp(cmd, "name") == 0) ++ else if (strcmp(cmd, "fullname") == 0) + { +- user_complete_name = mystrdup(par, "name"); ++ user_complete_name = mystrdup(par, "fullname"); + } + else if (strcmp(cmd, "description") == 0) + { +@@ -162,25 +206,39 @@ + } + else if (strcmp(cmd, "highlight") == 0) + { +- highlight = mystrdup(par, "description"); ++ if ((par != NULL) && (strlen(par) > 0)) { ++ highlight = mystrdup(par, "highlight"); ++ } + } + else if (strcmp(cmd, "theme") == 0) + { +- struct stat status; +- +- if ((stat(par, &status)) < 0) /* file doesn't exist, look for it under SYSCONFDIR */ ++ char *dummy; ++ ++ err_flg = -1; ++ dummy = getenv("HOME"); ++ if (dummy) + { ++ int len = strlen(dummy) + strlen(par) + 16; ++ theme_path = mymalloc(len * sizeof(char), "path"); ++ snprintf(theme_path, len, "%s/.firc/%s", dummy, par); ++ err_flg = load_theme(theme_path); ++ free(theme_path); ++ } ++ if (err_flg != 0) { ++ /* not found yet, try from /etc */ (617 more lines skipped) Index: f-irc.changes =================================================================== --- f-irc.changes (revision 0) +++ f-irc.changes (revision 5fa328c31f9a75f08928af0766fba627) @@ -0,0 +1,11 @@ +* Tue Aug 16 2011 Mika Laitio <[email protected]> - 0.0.30 +- Fix for BMC#22334. Configuration file is now created by default on first + launch by querying from the user the nickname, fullname, + irc server name and irc channel list and then creating + the config file to <user-home-dir>/.firc/firc.conf + Default irc-server: irc.freenode.net:6667 + Default irc-channel list: #meego,#meego-arm + +* Tue Jun 21 2011 Mika Laitio <[email protected]> - 0.0.30 +- initial obs build from console based f-irc + Index: fi-0.0.30-gplv2-license-confirmation.patch =================================================================== --- fi-0.0.30-gplv2-license-confirmation.patch (revision 0) +++ fi-0.0.30-gplv2-license-confirmation.patch (revision 5fa328c31f9a75f08928af0766fba627) @@ -0,0 +1,58 @@ +diff -Naur fi-0.0.30-orig/license.txt fi-0.0.30/license.txt +--- fi-0.0.30-orig/license.txt 1970-01-01 02:00:00.000000000 +0200 ++++ fi-0.0.30/license.txt 2011-06-20 22:11:16.783813939 +0300 +@@ -0,0 +1,53 @@ ++Return-Path: <folkert at vanheusden.com> ++X-Original-To: lamikr at pilppa.org ++Delivered-To: lamikr at pilppa.org ++Received: from mail.pilppa.org (mail.pilppa.org [83.102.60.31]) ++Received: from belle.intranet.vanheusden.com (belle.intranet.vanheusden.com [192.168.64.100]) ++ by keetweej.vanheusden.com (Postfix) with ESMTP id 2FC5C1612EC ++ for <lamikr at pilppa.org>; Mon, 20 Jun 2011 20:36:43 +0200 (CEST) ++Received: by belle.intranet.vanheusden.com (Postfix, from userid 1000) ++ id DF18FA5405; Mon, 20 Jun 2011 20:36:47 +0200 (CEST) ++Date: Mon, 20 Jun 2011 20:36:47 +0200 ++From: folkert <folkert at vanheusden.com> ++To: Mika Laitio <lamikr at pilppa.org> ++Subject: Re: [SPAM] f-irc license ++Message-ID: <[email protected]> ++References: <[email protected]> ++MIME-Version: 1.0 ++Content-Type: text/plain; charset=us-ascii ++Content-Disposition: inline ++In-Reply-To: <[email protected]> ++Organization: www.unixexpert.nl ++X-Chameleon-Return-To: folkert at vanheusden.com ++X-Xfmail-Return-To: folkert at vanheusden.com ++X-Phonenumber: +31-6-41278122 ++X-URL: http://www.vanheusden.com/ ++X-PGP-KeyID: 1F28D8AE ++X-GPG-fingerprint: AC89 09CE 41F2 00B4 FCF2 B174 3019 0E8C 1F28 D8AE ++X-Key: http://pgp.surfnet.nl:11371/pks/lookup?op=get&search=0x1F28D8AE ++Return-Receipt-To: <folkert at vanheusden.com> ++Read-Receipt-To: <folkert at vanheusden.com> ++Reply-By: Tue Jun 21 20:31:40 CEST 2011 ++X-Message-Flag: MultiTail - tail on steroids ++User-Agent: Mutt/1.5.18 (2008-05-17) ++ ++> I found today f-irc 0.0.30 and it looks really nice small irc client. ++> I planned to make rpm from it for meego but I could not find any ++> mentioning from it's license in the source code or from your web page. ++> ++> Freshmeat net mentions GPL in http://freshmeat.net/projects/fi ++> but is this correct? ++ ++hi, ++ ++the license is gplv2 ++succes! ++ ++ ++Folkert van Heusden ++ ++-- ++Looking for a cheap but fast webhoster with an excellent helpdesk? ++http://keetweej.vanheusden.com/redir.php?id=1001 ++---------------------------------------------------------------------- ++Phone: +xyz, PGP-key: 1F28D8AE, www.vanheusden.com + Index: fi-0.0.30-install-fix.patch =================================================================== --- fi-0.0.30-install-fix.patch (revision 0) +++ fi-0.0.30-install-fix.patch (revision 5fa328c31f9a75f08928af0766fba627) @@ -0,0 +1,55 @@ +diff -Naur fi-0.0.30-orig/f-irc.desktop fi-0.0.30/f-irc.desktop +--- fi-0.0.30-orig/f-irc.desktop 1970-01-01 02:00:00.000000000 +0200 ++++ fi-0.0.30/f-irc.desktop 2011-06-21 17:36:18.789671282 +0300 +@@ -0,0 +1,13 @@ ++ ++[Desktop Entry] ++Encoding=UTF-8 ++Name=irc ++GenericName=irc client ++Comment=console based irc client ++Exec=xterm -exec f-irc ++Icon=icons-Applications-xterminal ++Type=Application ++Categories=System;Utility; ++NoDisplay=false ++NotShowIn=X-MEEGO-NB; ++X-Desktop-File-Install-Version=0.16 +diff -Naur fi-0.0.30-orig/Makefile fi-0.0.30/Makefile +--- fi-0.0.30-orig/Makefile 2010-07-12 23:45:18.000000000 +0300 ++++ fi-0.0.30/Makefile 2011-06-21 17:38:10.211423240 +0300 +@@ -1,11 +1,12 @@ + VERSION=0.0.30 + +-DESTDIR=/usr +-SYSCONFDIR=/etc ++PREFIXDIR=$(DESTDIR)/usr ++SYSCONFDIR=$(DESTDIR)/etc + + DEBUG=-g -D_DEBUG -W -pedantic # -pg #-fprofile-arcs + LDFLAGS=-lpanel -lncurses $(DEBUG) -O2 +-CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" -DSYSCONFDIR=\"$(SYSCONFDIR)\" $(DEBUG) ++CFLAGS=-O2 -Wall -DVERSION=\"$(VERSION)\" -DSYSCONFDIR=\"$(SYSCONFDIR)\" -ggdb $(DEBUG) ++CXXFLAGS=-O2 -Wall -DVERSION=\"$(VERSION)\" -DSYSCONFDIR=\"$(SYSCONFDIR)\" -ggdb $(DEBUG) + + OBJS=theme.o buffer.o channels.o error.o utils.o loop.o term.o tcp.o main.o irc.o user.o names.o config.o dcc.o + +@@ -15,12 +16,15 @@ + $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o fi + + install: fi +- cp fi $(DESTDIR)/bin +- ln -s $(DESTDIR)/bin/fi $(DESTDIR)/bin/f-irc ++ mkdir -p $(PREFIXDIR)/bin ++ mkdir -p $(PREFIXDIR)/share/applications ++ mkdir -p $(SYSCONFDIR) ++ cp fi $(PREFIXDIR)/bin/f-irc ++ cp f-irc.desktop $(PREFIXDIR)/share/applications + cp firc.conf firc.theme $(SYSCONFDIR) + + uninstall: clean +- rm -f $(DESTDIR)/bin/fi ++ rm -f $(PREFIXDIR)/bin/fi $(PREFIXDIR)/bin/f-irc + rm -f $(SYSCONFDIR)/firc.conf $(SYSCONFDIR)/firc.theme + + clean: Index: fi-0.0.30.tgz =================================================================== Binary file fi-0.0.30.tgz added Index: fi-0.0.30-build_warnings.patch =================================================================== --- fi-0.0.30-build_warnings.patch (revision 0) +++ fi-0.0.30-build_warnings.patch (revision 5fa328c31f9a75f08928af0766fba627) @@ -0,0 +1,87 @@ +diff -Naur fi-0.0.30-orig/buffer.c fi-0.0.30/buffer.c +--- fi-0.0.30-orig/buffer.c 2010-07-12 23:45:18.000000000 +0300 ++++ fi-0.0.30/buffer.c 2011-06-21 18:49:42.529671086 +0300 +@@ -65,6 +65,7 @@ + + void show_new_buffer_lines(NEWWIN *where_to, buffer *pbuffer) + { ++ (void)where_to; + while(pbuffer -> last_shown < pbuffer -> n_elements) + { + /* ... show pbuffer -> list[pbuffer -> last_shown]; */ +diff -Naur fi-0.0.30-orig/dcc.c fi-0.0.30/dcc.c +--- fi-0.0.30-orig/dcc.c 2010-07-12 23:45:18.000000000 +0300 ++++ fi-0.0.30/dcc.c 2011-06-21 18:49:42.530671291 +0300 +@@ -45,7 +45,7 @@ + + int new_conn_fd; + struct sockaddr sock_name, nc_sa; +- struct sockaddr_in *sock_name_in = &sock_name; ++ struct sockaddr_in *sock_name_in = (struct sockaddr_in *)&sock_name; + socklen_t sock_name_len = sizeof(sock_name), nc_sa_len = sizeof(nc_sa); + + /* determine the address of the socket used to connect to the irc-server, +@@ -83,7 +83,7 @@ + return -1; + } + /* bind socket to port 0: let the OS pick a portnumber */ +- sock_name_in -> sin_port = 0; ++ sock_name_in->sin_port = 0; + if (bind(dcc_list[di].fd_conn, &sock_name, sock_name_len)) + { + set_dcc_state(di, STATE_ERROR); +diff -Naur fi-0.0.30-orig/loop.c fi-0.0.30/loop.c +--- fi-0.0.30-orig/loop.c 2010-07-12 23:45:18.000000000 +0300 ++++ fi-0.0.30/loop.c 2011-06-21 18:49:42.530671291 +0300 +@@ -12,6 +12,8 @@ + #include <sys/socket.h> + #include <sys/stat.h> + #include <unistd.h> ++#define _GNU_SOURCE ++#include <string.h> + + #include "gen.h" + #include "error.h" +diff -Naur fi-0.0.30-orig/tcp.c fi-0.0.30/tcp.c +--- fi-0.0.30-orig/tcp.c 2010-07-12 23:45:18.000000000 +0300 ++++ fi-0.0.30/tcp.c 2011-06-21 18:49:42.531670937 +0300 +@@ -70,7 +70,7 @@ + int check_connection_progress(int fd) + { + int optval=0; +- int optvallen=sizeof(optval); ++ socklen_t optvallen=sizeof(optval); + + LOG("wfds: connectionstate\n"); + +diff -Naur fi-0.0.30-orig/term.c fi-0.0.30/term.c +--- fi-0.0.30-orig/term.c 2010-07-12 23:45:18.000000000 +0300 ++++ fi-0.0.30/term.c 2011-06-21 18:49:42.531670937 +0300 +@@ -34,6 +34,8 @@ + + void color_on(NEWWIN *win, color col) + { ++ (void)win; ++ (void)col; + #if 0 + if (col.mode == COLOR_MODE_INDEX) + { +@@ -45,6 +47,8 @@ + + void color_off(NEWWIN *win, color col) + { ++ (void)win; ++ (void)col; + #if 0 + if (col.mode == COLOR_MODE_INDEX) + { +@@ -56,9 +60,6 @@ + + void delete_window(NEWWIN *mywin) + { +- int x, y; +- int index = 0; +- + mydelwin(mywin); + + mydoupdate(); Index: Makefile =================================================================== --- Makefile (revision 0) +++ Makefile (revision 5fa328c31f9a75f08928af0766fba627) @@ -0,0 +1,5 @@ +PKG_NAME := f-irc +SPECFILE = $(addsuffix .spec, $(PKG_NAME)) +YAMLFILE = $(addsuffix .yaml, $(PKG_NAME)) + +include /usr/share/packaging-tools/Makefile.common
