Compare commits
32 Commits
f026f3ae43
...
bf3d066093
Author | SHA1 | Date |
---|---|---|
Jonas 'Sortie' Termansen | bf3d066093 | |
Jonas 'Sortie' Termansen | c0f1a19168 | |
Jonas 'Sortie' Termansen | bc48ded292 | |
Jonas 'Sortie' Termansen | 870fb38bf2 | |
Jonas 'Sortie' Termansen | 2ce9f50905 | |
Jonas 'Sortie' Termansen | f29bbcbde8 | |
Jonas 'Sortie' Termansen | 93fac0fde3 | |
Jonas 'Sortie' Termansen | 82d0bf2b79 | |
Jonas 'Sortie' Termansen | 9910260de7 | |
Jonas 'Sortie' Termansen | e6c6570bf0 | |
Jonas 'Sortie' Termansen | 3ae267d16c | |
Jonas 'Sortie' Termansen | dd08eba6fb | |
Jonas 'Sortie' Termansen | cf353e38af | |
Jonas 'Sortie' Termansen | 2a663892c5 | |
Jonas 'Sortie' Termansen | 615747faf6 | |
Jonas 'Sortie' Termansen | e83b67da24 | |
Jonas 'Sortie' Termansen | 8ee87fc11a | |
Jonas 'Sortie' Termansen | 9c32119949 | |
Jonas 'Sortie' Termansen | 6c52971e8f | |
Jonas 'Sortie' Termansen | 0fb0df0f62 | |
Jonas 'Sortie' Termansen | ba25d9ea1f | |
Jonas 'Sortie' Termansen | d95127432a | |
Jonas 'Sortie' Termansen | 1b5f3242ad | |
Jonas 'Sortie' Termansen | 51cc59f4ca | |
Jonas 'Sortie' Termansen | ec9aa03f99 | |
Jonas 'Sortie' Termansen | ea075b6f44 | |
Jonas 'Sortie' Termansen | 5c9d9fc9ec | |
Jonas 'Sortie' Termansen | 56fbc45a9f | |
Jonas 'Sortie' Termansen | 29d7c4aa72 | |
Jonas 'Sortie' Termansen | a2b31ec1cb | |
Jonas 'Sortie' Termansen | 8681cac923 | |
Juhani Krekelä | 13a75f84e9 |
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
set_minimal="cut dash e2fsprogs grep grub libssl mdocml sed signify tar wget xargs xz"
|
set_minimal="cut dash e2fsprogs grep grub libssl mdocml sed signify tar wget xargs xz"
|
||||||
set_basic="$set_minimal binutils bison bzip2 diffutils ed flex gawk gcc git gzip libcurl libcurses libstdc++ m4 make nano ntpd patch perl pkg-config python ssh texinfo vim xorriso"
|
set_basic="$set_minimal binutils bison bzip2 diffutils ed flex gawk gcc git gzip irssi libcurl libcurses libstdc++ m4 make nano ntpd patch perl pkg-config python ssh texinfo vim xorriso"
|
||||||
sets="basic minimal"
|
sets="basic minimal"
|
||||||
|
|
|
@ -1,16 +1,50 @@
|
||||||
diff -Paur --no-dereference -- irssi.upstream/Makefile.in irssi/Makefile.in
|
diff -Paur --no-dereference -- irssi.upstream/Makefile.in irssi/Makefile.in
|
||||||
--- irssi.upstream/Makefile.in
|
--- irssi.upstream/Makefile.in
|
||||||
+++ irssi/Makefile.in
|
+++ irssi/Makefile.in
|
||||||
@@ -941,7 +941,8 @@
|
@@ -426,7 +426,7 @@
|
||||||
|
BUILT_SOURCES = default-config.h default-theme.h irssi-version.h
|
||||||
|
CLEANFILES = default-config.h default-theme.h
|
||||||
|
SUBDIRS = src tests docs scripts themes utils
|
||||||
|
-confdir = $(sysconfdir)
|
||||||
|
+confdir = $(sysconfdir)/examples
|
||||||
|
conf_DATA = irssi.conf
|
||||||
|
pkgconfig_DATA = irssi-1.pc
|
||||||
|
pkginclude_HEADERS = irssi-config.h irssi-version.h
|
||||||
|
diff -Paur --no-dereference -- irssi.upstream/configure irssi/configure
|
||||||
|
--- irssi.upstream/configure
|
||||||
|
+++ irssi/configure
|
||||||
|
@@ -18236,4 +18236,3 @@
|
||||||
|
|
||||||
info-am:
|
echo
|
||||||
|
echo "If there are any problems, read the INSTALL file."
|
||||||
|
-
|
||||||
|
diff -Paur --no-dereference -- irssi.upstream/irssi.conf irssi/irssi.conf
|
||||||
|
--- irssi.upstream/irssi.conf
|
||||||
|
+++ irssi/irssi.conf
|
||||||
|
@@ -1,4 +1,5 @@
|
||||||
|
servers = (
|
||||||
|
+ { address = "irc.sortix.org"; chatnet = "sortix"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
|
||||||
|
{ address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
|
||||||
|
{ address = "ssl.efnet.org"; chatnet = "EFNet"; port = "9999"; use_tls = "yes"; tls_verify = "no"; },
|
||||||
|
{ address = "irc.esper.net"; chatnet = "EsperNet"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
|
||||||
|
@@ -16,6 +17,9 @@
|
||||||
|
);
|
||||||
|
|
||||||
-install-data-am: install-confDATA install-pkgconfigDATA \
|
chatnets = {
|
||||||
+# PATCH: Don't install /etc/irssi.conf. Same configuration is built-in.
|
+ sortix = {
|
||||||
+install-data-am: install-pkgconfigDATA \
|
+ type = "IRC";
|
||||||
install-pkgincludeHEADERS
|
+ };
|
||||||
|
DALnet = {
|
||||||
|
type = "IRC";
|
||||||
|
max_kicks = "4";
|
||||||
|
@@ -94,6 +98,7 @@
|
||||||
|
};
|
||||||
|
|
||||||
install-dvi: install-dvi-recursive
|
channels = (
|
||||||
|
+ { name = "#sortix"; chatnet = "sortix"; autojoin = "No"; },
|
||||||
|
{ name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; },
|
||||||
|
{ name = "#libera"; chatnet = "liberachat";autojoin = "No"; },
|
||||||
|
{ name = "#irssi"; chatnet = "liberachat";autojoin = "No"; },
|
||||||
diff -Paur --no-dereference -- irssi.upstream/src/core/log.c irssi/src/core/log.c
|
diff -Paur --no-dereference -- irssi.upstream/src/core/log.c irssi/src/core/log.c
|
||||||
--- irssi.upstream/src/core/log.c
|
--- irssi.upstream/src/core/log.c
|
||||||
+++ irssi/src/core/log.c
|
+++ irssi/src/core/log.c
|
||||||
|
@ -81,18 +115,27 @@ diff -Paur --no-dereference -- irssi.upstream/src/core/net-disconnect.c irssi/sr
|
||||||
diff -Paur --no-dereference -- irssi.upstream/src/core/network.c irssi/src/core/network.c
|
diff -Paur --no-dereference -- irssi.upstream/src/core/network.c irssi/src/core/network.c
|
||||||
--- irssi.upstream/src/core/network.c
|
--- irssi.upstream/src/core/network.c
|
||||||
+++ irssi/src/core/network.c
|
+++ irssi/src/core/network.c
|
||||||
@@ -501,16 +501,8 @@
|
@@ -491,8 +491,6 @@
|
||||||
|
|
||||||
|
int net_host2ip(const char *host, IPADDR *ip)
|
||||||
|
{
|
||||||
|
- unsigned long addr;
|
||||||
|
-
|
||||||
|
if (strchr(host, ':') != NULL) {
|
||||||
|
/* IPv6 */
|
||||||
|
ip->family = AF_INET6;
|
||||||
|
@@ -501,16 +499,8 @@
|
||||||
} else {
|
} else {
|
||||||
/* IPv4 */
|
/* IPv4 */
|
||||||
ip->family = AF_INET;
|
ip->family = AF_INET;
|
||||||
-#ifdef HAVE_INET_ATON
|
-#ifdef HAVE_INET_ATON
|
||||||
- if (inet_aton(host, &ip->ip.s_addr) == 0)
|
- if (inet_aton(host, &ip->ip.s_addr) == 0)
|
||||||
+ if (inet_pton(AF_INET, host, &ip->ip) == 0)
|
- return -1;
|
||||||
return -1;
|
|
||||||
-#else
|
-#else
|
||||||
- addr = inet_addr(host);
|
- addr = inet_addr(host);
|
||||||
- if (addr == INADDR_NONE)
|
- if (addr == INADDR_NONE)
|
||||||
- return -1;
|
+ if (inet_pton(AF_INET, host, &ip->ip) == 0)
|
||||||
|
return -1;
|
||||||
-
|
-
|
||||||
- memcpy(&ip->ip, &addr, 4);
|
- memcpy(&ip->ip, &addr, 4);
|
||||||
-#endif
|
-#endif
|
||||||
|
|
|
@ -9,5 +9,7 @@ UPSTREAM_SITE=https://codeberg.org/irssi/irssi/releases/download/$VERSION
|
||||||
UPSTREAM_ARCHIVE=$ARCHIVE
|
UPSTREAM_ARCHIVE=$ARCHIVE
|
||||||
RELEASE_SEARCH_PAGE=https://codeberg.org/irssi/irssi/releases
|
RELEASE_SEARCH_PAGE=https://codeberg.org/irssi/irssi/releases
|
||||||
BUILD_SYSTEM=configure
|
BUILD_SYSTEM=configure
|
||||||
|
# Perl support in irssi is fundamentally broken for cross-compilation.
|
||||||
|
CONFIGURE_ARGS='--enable-true-color --with-perl=no'
|
||||||
MAKE_VARS=V=1
|
MAKE_VARS=V=1
|
||||||
LICENSE=GPL-2.0-or-later
|
LICENSE=GPL-2.0-or-later
|
||||||
|
|
Loading…
Reference in New Issue