IPFire-SCM June 2015

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 37835947b2615a735aca6acde4a436c023267052
by git＠ipfire.org 30 Jun '15

30 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 37835947b2615a735aca6acde4a436c023267052 (commit) via 11789f683c6c5c2ae3cbad85b49a413c09086049 (commit) from 5019890f4f2e189347fd3fde6f3ea1a45bbd524a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 37835947b2615a735aca6acde4a436c023267052 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 30 10:46:27 2015 +0000 collecty: Import upstream changes The latency plugin was rewritten and uses liboping now. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 11789f683c6c5c2ae3cbad85b49a413c09086049 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 30 10:04:46 2015 +0000 liboping: New package A simple library that sends ICMP echo requests. Required for collecty Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: collecty/collecty.nm | 3 +- ...plugins-Automatically-replace-None-by-NaN.patch | 56 ++ .../0002-latency-Rewrite-latency-module.patch | 995 +++++++++++++++++++++ liboping/liboping.nm | 50 ++ 4 files changed, 1103 insertions(+), 1 deletion(-) create mode 100644 collecty/patches/0001-plugins-Automatically-replace-None-by-NaN.patch create mode 100644 collecty/patches/0002-latency-Rewrite-latency-module.patch create mode 100644 liboping/liboping.nm Difference in files: diff --git a/collecty/collecty.nm b/collecty/collecty.nm index d1e0318..ea14b1b 100644 --- a/collecty/collecty.nm +++ b/collecty/collecty.nm @@ -5,7 +5,7 @@ name = collecty version = 003 -release = 2 +release = 3 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Monitoring @@ -31,6 +31,7 @@ build intltool libatasmart-devel libtool-devel + liboping-devel libxslt lm-sensors-devel python3-devel diff --git a/collecty/patches/0001-plugins-Automatically-replace-None-by-NaN.patch b/collecty/patches/0001-plugins-Automatically-replace-None-by-NaN.patch new file mode 100644 index 0000000..772c65d --- /dev/null +++ b/collecty/patches/0001-plugins-Automatically-replace-None-by-NaN.patch @@ -0,0 +1,56 @@ +From a9af411f0703eac939e0df5d5f75b46d35f531bc Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Mon, 29 Jun 2015 20:44:18 +0000 +Subject: [PATCH 1/2] plugins: Automatically replace None by NaN + +rrdtool uses NaN to represent no value. Python uses None. +This patch automatically translates from None to NaN. + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + src/collecty/plugins/base.py | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/src/collecty/plugins/base.py b/src/collecty/plugins/base.py +index bed461f..cf9c3b4 100644 +--- a/src/collecty/plugins/base.py ++++ b/src/collecty/plugins/base.py +@@ -147,8 +147,7 @@ class Plugin(object, metaclass=PluginRegistration): + try: + result = o.collect() + +- if isinstance(result, tuple) or isinstance(result, list): +- result = ":".join(("%s" % e for e in result)) ++ result = self._format_result(result) + except: + self.log.warning(_("Unhandled exception in %s.collect()") % o, exc_info=True) + continue +@@ -170,6 +169,25 @@ class Plugin(object, metaclass=PluginRegistration): + if delay >= 60: + self.log.warning(_("A worker thread was stalled for %.4fs") % delay) + ++ @staticmethod ++ def _format_result(result): ++ if not isinstance(result, tuple) and not isinstance(result, list): ++ return result ++ ++ # Replace all Nones by NaN ++ s = [] ++ ++ for e in result: ++ if e is None: ++ e = "NaN" ++ ++ # Format as string ++ e = "%s" % e ++ ++ s.append(e) ++ ++ return ":".join(s) ++ + def get_object(self, id): + for object in self.objects: + if not object.id == id: +-- +1.8.1 + diff --git a/collecty/patches/0002-latency-Rewrite-latency-module.patch b/collecty/patches/0002-latency-Rewrite-latency-module.patch new file mode 100644 index 0000000..837502b --- /dev/null +++ b/collecty/patches/0002-latency-Rewrite-latency-module.patch @@ -0,0 +1,995 @@ +From 63f9f8beed445a80dcb492570b105c5b50e65a59 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Mon, 29 Jun 2015 20:49:02 +0000 +Subject: [PATCH 2/2] latency: Rewrite latency module + +This patch replaces the builtin python implementation +that pinged hosts by a Python C module that uses liboping. + +liboping is able to ping IPv6 hosts as well and should +implement the ICMP protocol more appropriately. + +The graph has been extended so that hosts will have a +line for latency over IPv6 and IPv4 if available and +the packet loss is merged from both protocols, too. + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + Makefile.am | 5 +- + configure.ac | 2 + + po/POTFILES.in | 1 - + src/_collectymodule.c | 338 ++++++++++++++++++++++++++++++++++++++++ + src/collecty/ping.py | 324 -------------------------------------- + src/collecty/plugins/latency.py | 151 +++++++++++------- + 6 files changed, 437 insertions(+), 384 deletions(-) + delete mode 100644 src/collecty/ping.py + +diff --git a/Makefile.am b/Makefile.am +index fe00da7..0b7e299 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -79,8 +79,7 @@ collecty_PYTHON = \ + src/collecty/daemon.py \ + src/collecty/errors.py \ + src/collecty/i18n.py \ +- src/collecty/logger.py \ +- src/collecty/ping.py ++ src/collecty/logger.py + + collectydir = $(pythondir)/collecty + +@@ -109,6 +108,7 @@ _collecty_la_SOURCES = \ + _collecty_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBATASMART_CFLAGS) \ ++ $(OPING_CFLAGS) \ + $(PYTHON_CFLAGS) + + _collecty_la_LDFLAGS = \ +@@ -119,6 +119,7 @@ _collecty_la_LDFLAGS = \ + + _collecty_la_LIBADD = \ + $(LIBATASMART_LIBS) \ ++ $(OPING_LIBS) \ + $(PYTHON_LIBS) \ + $(SENSORS_LIBS) + +diff --git a/configure.ac b/configure.ac +index 59250ca..9b540fd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -61,6 +61,8 @@ AC_PROG_GCC_TRADITIONAL + + AC_PATH_PROG([XSLTPROC], [xsltproc]) + ++PKG_CHECK_MODULES([OPING], [liboping]) ++ + # Python + AM_PATH_PYTHON([3.2]) + PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}]) +diff --git a/po/POTFILES.in b/po/POTFILES.in +index f6aebb3..a96f7b2 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -5,7 +5,6 @@ src/collecty/daemon.py + src/collecty/errors.py + src/collecty/i18n.py + src/collecty/__init__.py +-src/collecty/ping.py + src/collecty/plugins/base.py + src/collecty/plugins/conntrack.py + src/collecty/plugins/cpu.py +diff --git a/src/_collectymodule.c b/src/_collectymodule.c +index 422c27d..c13ca69 100644 +--- a/src/_collectymodule.c ++++ b/src/_collectymodule.c +@@ -22,15 +22,21 @@ + #include <errno.h> + #include <fcntl.h> + #include <linux/hdreg.h> ++#include <oping.h> + #include <sensors/error.h> + #include <sensors/sensors.h> + #include <stdbool.h> + #include <string.h> + #include <sys/ioctl.h> ++#include <time.h> + + #define MODEL_SIZE 40 + #define SERIAL_SIZE 20 + ++#define PING_HISTORY_SIZE 1024 ++#define PING_DEFAULT_COUNT 10 ++#define PING_DEFAULT_TIMEOUT 8 ++ + typedef struct { + PyObject_HEAD + char* path; +@@ -313,6 +319,324 @@ static PyTypeObject BlockDeviceType = { + BlockDevice_new, /* tp_new */ + }; + ++static PyObject* PyExc_PingError; ++static PyObject* PyExc_PingAddHostError; ++ ++typedef struct { ++ PyObject_HEAD ++ pingobj_t* ping; ++ const char* host; ++ struct { ++ double history[PING_HISTORY_SIZE]; ++ size_t history_index; ++ size_t history_size; ++ size_t packets_sent; ++ size_t packets_rcvd; ++ double average; ++ double stddev; ++ double loss; ++ } stats; ++} PingObject; ++ ++static void Ping_dealloc(PingObject* self) { ++ if (self->ping) ++ ping_destroy(self->ping); ++ ++ Py_TYPE(self)->tp_free((PyObject*)self); ++} ++ ++static void Ping_init_stats(PingObject* self) { ++ self->stats.history_index = 0; ++ self->stats.history_size = 0; ++ self->stats.packets_sent = 0; ++ self->stats.packets_rcvd = 0; ++ ++ self->stats.average = 0.0; ++ self->stats.stddev = 0.0; ++ self->stats.loss = 0.0; ++} ++ ++static PyObject* Ping_new(PyTypeObject* type, PyObject* args, PyObject* kwds) { ++ PingObject* self = (PingObject*)type->tp_alloc(type, 0); ++ ++ if (self) { ++ self->ping = NULL; ++ self->host = NULL; ++ ++ Ping_init_stats(self); ++ } ++ ++ return (PyObject*)self; ++} ++ ++static int Ping_init(PingObject* self, PyObject* args, PyObject* kwds) { ++ char* kwlist[] = {"host", "family", "timeout", "ttl", NULL}; ++ int family = PING_DEF_AF; ++ double timeout = PING_DEFAULT_TIMEOUT; ++ int ttl = PING_DEF_TTL; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|idi", kwlist, &self->host, ++ &family, &timeout, &ttl)) ++ return -1; ++ ++ if (family != AF_UNSPEC && family != AF_INET6 && family != AF_INET) { ++ PyErr_Format(PyExc_ValueError, "Family must be AF_UNSPEC, AF_INET6, or AF_INET"); ++ return -1; ++ } ++ ++ if (timeout < 0) { ++ PyErr_Format(PyExc_ValueError, "Timeout must be greater than zero"); ++ return -1; ++ } ++ ++ if (ttl < 1 || ttl > 255) { ++ PyErr_Format(PyExc_ValueError, "TTL must be between 1 and 255"); ++ return -1; ++ } ++ ++ self->ping = ping_construct(); ++ if (!self->ping) { ++ return -1; ++ } ++ ++ // Set options ++ int r; ++ ++ r = ping_setopt(self->ping, PING_OPT_AF, &family); ++ if (r) { ++ PyErr_Format(PyExc_RuntimeError, "Could not set address family: %s", ++ ping_get_error(self->ping)); ++ return -1; ++ } ++ ++ if (timeout > 0) { ++ r = ping_setopt(self->ping, PING_OPT_TIMEOUT, &timeout); ++ ++ if (r) { ++ PyErr_Format(PyExc_RuntimeError, "Could not set timeout: %s", ++ ping_get_error(self->ping)); ++ return -1; ++ } ++ } ++ ++ r = ping_setopt(self->ping, PING_OPT_TTL, &ttl); ++ if (r) { ++ PyErr_Format(PyExc_RuntimeError, "Could not set TTL: %s", ++ ping_get_error(self->ping)); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static double Ping_compute_average(PingObject* self) { ++ assert(self->stats.packets_rcvd > 0); ++ ++ double total_latency = 0.0; ++ ++ for (int i = 0; i < self->stats.history_size; i++) { ++ if (self->stats.history[i] > 0) ++ total_latency += self->stats.history[i]; ++ } ++ ++ return total_latency / self->stats.packets_rcvd; ++} ++ ++static double Ping_compute_stddev(PingObject* self, double mean) { ++ assert(self->stats.packets_rcvd > 0); ++ ++ double deviation = 0.0; ++ ++ for (int i = 0; i < self->stats.history_size; i++) { ++ if (self->stats.history[i] > 0) { ++ deviation += pow(self->stats.history[i] - mean, 2); ++ } ++ } ++ ++ // Normalise ++ deviation /= self->stats.packets_rcvd; ++ ++ return sqrt(deviation); ++} ++ ++static void Ping_compute_stats(PingObject* self) { ++ // Compute the average latency ++ self->stats.average = Ping_compute_average(self); ++ ++ // Compute the standard deviation ++ self->stats.stddev = Ping_compute_stddev(self, self->stats.average); ++ ++ // Compute lost packets ++ self->stats.loss = 1.0; ++ self->stats.loss -= (double)self->stats.packets_rcvd \ ++ / (double)self->stats.packets_sent; ++} ++ ++static double time_elapsed(struct timeval* t0) { ++ struct timeval now; ++ gettimeofday(&now, NULL); ++ ++ double r = now.tv_sec - t0->tv_sec; ++ r += ((double)now.tv_usec / 1000000) - ((double)t0->tv_usec / 1000000); ++ ++ return r; ++} ++ ++static PyObject* Ping_ping(PingObject* self, PyObject* args, PyObject* kwds) { ++ char* kwlist[] = {"count", "deadline", NULL}; ++ size_t count = PING_DEFAULT_COUNT; ++ double deadline = 0; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Id", kwlist, &count, &deadline)) ++ return NULL; ++ ++ int r = ping_host_add(self->ping, self->host); ++ if (r) { ++ PyErr_Format(PyExc_PingAddHostError, "Could not add host %s: %s", ++ self->host, ping_get_error(self->ping)); ++ return NULL; ++ } ++ ++ // Reset all collected statistics in case ping() is called more than once. ++ Ping_init_stats(self); ++ ++ // Save start time ++ struct timeval time_start; ++ r = gettimeofday(&time_start, NULL); ++ if (r) { ++ PyErr_Format(PyExc_RuntimeError, "Could not determine start time"); ++ return NULL; ++ } ++ ++ // Do the pinging ++ while (count--) { ++ self->stats.packets_sent++; ++ ++ Py_BEGIN_ALLOW_THREADS ++ r = ping_send(self->ping); ++ Py_END_ALLOW_THREADS ++ ++ // Count recieved packets ++ if (r >= 0) { ++ self->stats.packets_rcvd += r; ++ ++ // Raise any errors ++ } else { ++ PyErr_Format(PyExc_RuntimeError, "Error executing ping_send(): %s", ++ ping_get_error(self->ping)); ++ return NULL; ++ } ++ ++ // Extract all data ++ pingobj_iter_t* iter = ping_iterator_get(self->ping); ++ ++ double* latency = &self->stats.history[self->stats.history_index]; ++ size_t buffer_size = sizeof(latency); ++ ping_iterator_get_info(iter, PING_INFO_LATENCY, latency, &buffer_size); ++ ++ // Increase the history pointer ++ self->stats.history_index++; ++ self->stats.history_index %= sizeof(self->stats.history); ++ ++ // Increase the history size ++ if (self->stats.history_size < sizeof(self->stats.history)) ++ self->stats.history_size++; ++ ++ // Check if the deadline is due ++ if (deadline > 0) { ++ double elapsed_time = time_elapsed(&time_start); ++ ++ // If we have run longer than the deadline is, we end the main loop ++ if (elapsed_time >= deadline) ++ break; ++ } ++ } ++ ++ if (self->stats.packets_rcvd == 0) { ++ PyErr_Format(PyExc_PingError, "No replies received"); ++ return NULL; ++ } ++ ++ Ping_compute_stats(self); ++ ++ Py_RETURN_NONE; ++} ++ ++static PyObject* Ping_get_packets_sent(PingObject* self) { ++ return PyLong_FromUnsignedLong(self->stats.packets_sent); ++} ++ ++static PyObject* Ping_get_packets_rcvd(PingObject* self) { ++ return PyLong_FromUnsignedLong(self->stats.packets_rcvd); ++} ++ ++static PyObject* Ping_get_average(PingObject* self) { ++ return PyFloat_FromDouble(self->stats.average); ++} ++ ++static PyObject* Ping_get_stddev(PingObject* self) { ++ return PyFloat_FromDouble(self->stats.stddev); ++} ++ ++static PyObject* Ping_get_loss(PingObject* self) { ++ return PyFloat_FromDouble(self->stats.loss); ++} ++ ++static PyGetSetDef Ping_getsetters[] = { ++ {"average", (getter)Ping_get_average, NULL, NULL, NULL}, ++ {"loss", (getter)Ping_get_loss, NULL, NULL, NULL}, ++ {"stddev", (getter)Ping_get_stddev, NULL, NULL, NULL}, ++ {"packets_sent", (getter)Ping_get_packets_sent, NULL, NULL, NULL}, ++ {"packets_rcvd", (getter)Ping_get_packets_rcvd, NULL, NULL, NULL}, ++ {NULL} ++}; ++ ++static PyMethodDef Ping_methods[] = { ++ {"ping", (PyCFunction)Ping_ping, METH_VARARGS|METH_KEYWORDS, NULL}, ++ {NULL} ++}; ++ ++static PyTypeObject PingType = { ++ PyVarObject_HEAD_INIT(NULL, 0) ++ "_collecty.Ping", /*tp_name*/ ++ sizeof(PingObject), /*tp_basicsize*/ ++ 0, /*tp_itemsize*/ ++ (destructor)Ping_dealloc, /*tp_dealloc*/ ++ 0, /*tp_print*/ ++ 0, /*tp_getattr*/ ++ 0, /*tp_setattr*/ ++ 0, /*tp_compare*/ ++ 0, /*tp_repr*/ ++ 0, /*tp_as_number*/ ++ 0, /*tp_as_sequence*/ ++ 0, /*tp_as_mapping*/ ++ 0, /*tp_hash */ ++ 0, /*tp_call*/ ++ 0, /*tp_str*/ ++ 0, /*tp_getattro*/ ++ 0, /*tp_setattro*/ ++ 0, /*tp_as_buffer*/ ++ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /*tp_flags*/ ++ "Ping object", /* tp_doc */ ++ 0, /* tp_traverse */ ++ 0, /* tp_clear */ ++ 0, /* tp_richcompare */ ++ 0, /* tp_weaklistoffset */ ++ 0, /* tp_iter */ ++ 0, /* tp_iternext */ ++ Ping_methods, /* tp_methods */ ++ 0, /* tp_members */ ++ Ping_getsetters, /* tp_getset */ ++ 0, /* tp_base */ ++ 0, /* tp_dict */ ++ 0, /* tp_descr_get */ ++ 0, /* tp_descr_set */ ++ 0, /* tp_dictoffset */ ++ (initproc)Ping_init, /* tp_init */ ++ 0, /* tp_alloc */ ++ Ping_new, /* tp_new */ ++}; ++ + typedef struct { + PyObject_HEAD + const sensors_chip_name* chip; +@@ -743,6 +1067,9 @@ PyMODINIT_FUNC PyInit__collecty(void) { + if (PyType_Ready(&BlockDeviceType) < 0) + return NULL; + ++ if (PyType_Ready(&PingType) < 0) ++ return NULL; ++ + if (PyType_Ready(&SensorType) < 0) + return NULL; + +@@ -751,6 +1078,17 @@ PyMODINIT_FUNC PyInit__collecty(void) { + Py_INCREF(&BlockDeviceType); + PyModule_AddObject(m, "BlockDevice", (PyObject*)&BlockDeviceType); + ++ Py_INCREF(&PingType); ++ PyModule_AddObject(m, "Ping", (PyObject*)&PingType); ++ ++ PyExc_PingError = PyErr_NewException("_collecty.PingError", NULL, NULL); ++ Py_INCREF(PyExc_PingError); ++ PyModule_AddObject(m, "PingError", PyExc_PingError); ++ ++ PyExc_PingAddHostError = PyErr_NewException("_collecty.PingAddHostError", NULL, NULL); ++ Py_INCREF(PyExc_PingAddHostError); ++ PyModule_AddObject(m, "PingAddHostError", PyExc_PingAddHostError); ++ + Py_INCREF(&SensorType); + PyModule_AddObject(m, "Sensor", (PyObject*)&SensorType); + +diff --git a/src/collecty/ping.py b/src/collecty/ping.py +deleted file mode 100644 +index e2d7970..0000000 +--- a/src/collecty/ping.py ++++ /dev/null +@@ -1,324 +0,0 @@ +-#!/usr/bin/python3 +- +-import array +-import math +-import os +-import random +-import select +-import socket +-import struct +-import sys +-import time +- +-ICMP_TYPE_ECHO_REPLY = 0 +-ICMP_TYPE_ECHO_REQUEST = 8 +-ICMP_MAX_RECV = 2048 +- +-MAX_SLEEP = 1000 +- +-class PingError(Exception): +- msg = None +- +- +-class PingResolveError(PingError): +- msg = "Could not resolve hostname" +- +- +-class Ping(object): +- def __init__(self, destination, timeout=1000, packet_size=56): +- self.destination = self._resolve(destination) +- self.timeout = timeout +- self.packet_size = packet_size +- +- self.id = os.getpid() & 0xffff # XXX ? Is this a good idea? +- +- self.seq_number = 0 +- +- # Number of sent packets. +- self.send_count = 0 +- +- # Save the delay of all responses. +- self.times = [] +- +- def run(self, count=None, deadline=None): +- while True: +- delay = self.do() +- +- self.seq_number += 1 +- +- if count and self.seq_number >= count: +- break +- +- if deadline and self.total_time >= deadline: +- break +- +- if delay == None: +- delay = 0 +- +- if MAX_SLEEP > delay: +- time.sleep((MAX_SLEEP - delay) / 1000) +- +- def do(self): +- s = None +- try: +- # Open a socket for ICMP communication. +- s = socket.socket(socket.AF_INET, socket.SOCK_RAW, socket.getprotobyname("icmp")) +- +- # Send one packet. +- send_time = self.send_icmp_echo_request(s) +- +- # Increase number of sent packets (even if it could not be sent). +- self.send_count += 1 +- +- # If the packet could not be sent, we may stop here. +- if send_time is None: +- return +- +- # Wait for the reply. +- receive_time, packet_size, ip, ip_header, icmp_header = self.receive_icmp_echo_reply(s) +- +- finally: +- # Close the socket. +- if s: +- s.close() +- +- # If a packet has been received... +- if receive_time: +- delay = (receive_time - send_time) * 1000 +- self.times.append(delay) +- +- return delay +- +- def send_icmp_echo_request(self, s): +- # Header is type (8), code (8), checksum (16), id (16), sequence (16) +- checksum = 0 +- +- # Create a header with checksum == 0. +- header = struct.pack("!BBHHH", ICMP_TYPE_ECHO_REQUEST, 0, +- checksum, self.id, self.seq_number) +- +- # Get some bytes for padding. +- padding = os.urandom(self.packet_size) +- +- # Calculate the checksum for header + padding data. +- checksum = self._calculate_checksum(header + padding) +- +- # Rebuild the header with the new checksum. +- header = struct.pack("!BBHHH", ICMP_TYPE_ECHO_REQUEST, 0, +- checksum, self.id, self.seq_number) +- +- # Build the packet. +- packet = header + padding +- +- # Save the time when the packet has been sent. +- send_time = time.time() +- +- # Send the packet. +- try: +- s.sendto(packet, (self.destination, 0)) +- except socket.error as e: +- if e.errno == 1: # Operation not permitted +- # The packet could not be sent, probably because of +- # wrong firewall settings. +- return +- +- return send_time +- +- def receive_icmp_echo_reply(self, s): +- timeout = self.timeout / 1000.0 +- +- # Wait until the reply packet arrived or until we hit timeout. +- while True: +- select_start = time.time() +- +- inputready, outputready, exceptready = select.select([s], [], [], timeout) +- select_duration = (time.time() - select_start) +- +- if inputready == []: # Timeout +- return None, 0, 0, 0, 0 +- +- # Save the time when the packet has been received. +- receive_time = time.time() +- +- # Read the packet from the socket. +- packet_data, address = s.recvfrom(ICMP_MAX_RECV) +- +- # Parse the ICMP header. +- icmp_header = self._header2dict( +- ["type", "code", "checksum", "packet_id", "seq_number"], +- "!BBHHH", packet_data[20:28] +- ) +- +- # This is the reply to our packet if the ID matches. +- if icmp_header["packet_id"] == self.id: +- # Parse the IP header. +- ip_header = self._header2dict( +- ["version", "type", "length", "id", "flags", +- "ttl", "protocol", "checksum", "src_ip", "dst_ip"], +- "!BBHHHBBHII", packet_data[:20] +- ) +- +- packet_size = len(packet_data) - 28 +- ip = socket.inet_ntoa(struct.pack("!I", ip_header["src_ip"])) +- +- return receive_time, packet_size, ip, ip_header, icmp_header +- +- # Check if the timeout has already been hit. +- timeout = timeout - select_duration +- if timeout <= 0: +- return None, 0, 0, 0, 0 +- +- def _header2dict(self, names, struct_format, data): +- """ +- Unpack tghe raw received IP and ICMP header informations to a dict +- """ +- unpacked_data = struct.unpack(struct_format, data) +- return dict(list(zip(names, unpacked_data))) +- +- def _calculate_checksum(self, source_string): +- if len(source_string) % 2: +- source_string += "\x00" +- +- converted = array.array("H", source_string) +- if sys.byteorder == "big": +- converted.byteswap() +- +- val = sum(converted) +- +- # Truncate val to 32 bits (a variance from ping.c, which uses signed +- # integers, but overflow is unlinkely in ping). +- val &= 0xffffffff +- +- # Add high 16 bits to low 16 bits. +- val = (val >> 16) + (val & 0xffff) +- +- # Add carry from above (if any). +- val += (val >> 16) +- +- # Invert and truncate to 16 bits. +- answer = ~val & 0xffff +- +- return socket.htons(answer) +- +- def _resolve(self, host): +- """ +- Resolve host. +- """ +- if self._is_valid_ipv4_address(host): +- return host +- +- try: +- return socket.gethostbyname(host) +- except socket.gaierror as e: +- if e.errno == -3: +- raise PingResolveError +- +- raise +- +- def _is_valid_ipv4_address(self, addr): +- """ +- Check addr to be a valid IPv4 address. +- """ +- parts = addr.split(".") +- +- if not len(parts) == 4: +- return False +- +- for part in parts: +- try: +- number = int(part) +- except ValueError: +- return False +- +- if number > 255: +- return False +- +- return True +- +- @property +- def receive_count(self): +- """ +- The number of received packets. +- """ +- return len(self.times) +- +- @property +- def total_time(self): +- """ +- The total time of all roundtrips. +- """ +- try: +- return sum(self.times) +- except ValueError: +- return +- +- @property +- def min_time(self): +- """ +- The smallest roundtrip time. +- """ +- try: +- return min(self.times) +- except ValueError: +- return +- +- @property +- def max_time(self): +- """ +- The biggest roundtrip time. +- """ +- try: +- return max(self.times) +- except ValueError: +- return +- +- @property +- def avg_time(self): +- """ +- Calculate the average response time. +- """ +- try: +- return self.total_time / self.receive_count +- except ZeroDivisionError: +- return +- +- @property +- def variance(self): +- """ +- Calculate the variance of all roundtrips. +- """ +- if self.avg_time is None: +- return +- +- var = 0 +- +- for t in self.times: +- var += (t - self.avg_time) ** 2 +- +- var /= self.receive_count +- return var +- +- @property +- def stddev(self): +- """ +- Standard deviation of all roundtrips. +- """ +- return math.sqrt(self.variance) +- +- @property +- def loss(self): +- """ +- Outputs the percentage of dropped packets. +- """ +- dropped = self.send_count - self.receive_count +- +- return dropped / self.send_count +- +- +-if __name__ == "__main__": +- p = Ping("ping.ipfire.org") +- p.run(count=5) +- +- print("Min/Avg/Max/Stddev: %.2f/%.2f/%.2f/%.2f" % \ +- (p.min_time, p.avg_time, p.max_time, p.stddev)) +- print("Sent/Recv/Loss: %d/%d/%.2f" % (p.send_count, p.receive_count, p.loss)) +diff --git a/src/collecty/plugins/latency.py b/src/collecty/plugins/latency.py +index df67102..a219240 100644 +--- a/src/collecty/plugins/latency.py ++++ b/src/collecty/plugins/latency.py +@@ -19,8 +19,9 @@ + # # + ############################################################################### + +-import collecty.ping ++import socket + ++import collecty._collecty + from . import base + + from ..i18n import _ +@@ -37,86 +38,124 @@ class GraphTemplateLatency(base.GraphTemplate): + @property + def rrd_graph(self): + return [ +- "DEF:latency=%(file)s:latency:AVERAGE", +- "DEF:latency_loss=%(file)s:latency_loss:AVERAGE", +- "DEF:latency_stddev=%(file)s:latency_stddev:AVERAGE", +- +- # Compute loss in percentage. +- "CDEF:latency_ploss=latency_loss,100,*", +- +- # Compute standard deviation. +- "CDEF:stddev1=latency,latency_stddev,+", +- "CDEF:stddev2=latency,latency_stddev,-", +- +- "CDEF:l005=latency_ploss,0,5,LIMIT,UN,UNKN,INF,IF", +- "CDEF:l010=latency_ploss,5,10,LIMIT,UN,UNKN,INF,IF", +- "CDEF:l025=latency_ploss,10,25,LIMIT,UN,UNKN,INF,IF", +- "CDEF:l050=latency_ploss,25,50,LIMIT,UN,UNKN,INF,IF", +- "CDEF:l100=latency_ploss,50,100,LIMIT,UN,UNKN,INF,IF", +- ++ "DEF:latency6=%(file)s:latency6:AVERAGE", ++ "DEF:loss6=%(file)s:loss6:AVERAGE", ++ "DEF:stddev6=%(file)s:stddev6:AVERAGE", ++ ++ "DEF:latency4=%(file)s:latency4:AVERAGE", ++ "DEF:loss4=%(file)s:loss4:AVERAGE", ++ "DEF:stddev4=%(file)s:stddev4:AVERAGE", ++ ++ # Compute the biggest loss and convert into percentage ++ "CDEF:ploss=loss6,loss4,MAX,100,*", ++ ++ # Compute standard deviation ++ "CDEF:stddevarea6=stddev6,2,*", ++ "CDEF:spacer6=latency6,stddev6,-", ++ "CDEF:stddevarea4=stddev4,2,*", ++ "CDEF:spacer4=latency4,stddev4,-", ++ ++ "CDEF:l005=ploss,0,5,LIMIT,UN,UNKN,INF,IF", ++ "CDEF:l010=ploss,5,10,LIMIT,UN,UNKN,INF,IF", ++ "CDEF:l025=ploss,10,25,LIMIT,UN,UNKN,INF,IF", ++ "CDEF:l050=ploss,25,50,LIMIT,UN,UNKN,INF,IF", ++ "CDEF:l100=ploss,50,100,LIMIT,UN,UNKN,INF,IF", ++ ++ "VDEF:latency6min=latency6,MINIMUM", ++ "VDEF:latency6max=latency6,MAXIMUM", ++ "VDEF:latency6avg=latency6,AVERAGE", ++ "VDEF:latency4min=latency4,MINIMUM", ++ "VDEF:latency4max=latency4,MAXIMUM", ++ "VDEF:latency4avg=latency4,AVERAGE", ++ ++ "LINE1:latency6avg#00ff0066:%s" % _("Average latency (IPv6)"), ++ "LINE1:latency4avg#ff000066:%s\\r" % _("Average latency (IPv4)"), ++ ++ "COMMENT:%s" % _("Packet Loss"), + "AREA:l005#ffffff:%s" % _("0-5%%"), +- "AREA:l010#000000:%s" % _("5-10%%"), +- "AREA:l025#ff0000:%s" % _("10-25%%"), +- "AREA:l050#00ff00:%s" % _("25-50%%"), +- "AREA:l100#0000ff:%s" % _("50-100%%") + "\\n", +- +- "LINE1:stddev1#00660088", +- "LINE1:stddev2#00660088", +- +- "LINE3:latency#ff0000:%s" % _("Latency"), +- "VDEF:latencymin=latency,MINIMUM", +- "VDEF:latencymax=latency,MAXIMUM", +- "VDEF:latencyavg=latency,AVERAGE", +- "GPRINT:latencymax:%12s\:" % _("Maximum") + " %6.2lf", +- "GPRINT:latencymin:%12s\:" % _("Minimum") + " %6.2lf", +- "GPRINT:latencyavg:%12s\:" % _("Average") + " %6.2lf\\n", +- +- "LINE1:latencyavg#000000:%s" % _("Average latency"), ++ "AREA:l010#cccccc:%s" % _("5-10%%"), ++ "AREA:l025#999999:%s" % _("10-25%%"), ++ "AREA:l050#666666:%s" % _("25-50%%"), ++ "AREA:l100#333333:%s" % _("50-100%%") + "\\r", ++ ++ "COMMENT: \\n", # empty line ++ ++ "AREA:spacer4", ++ "AREA:stddevarea4#ff000033:STACK", ++ "LINE2:latency4#ff0000:%s" % _("Latency (IPv4)"), ++ "GPRINT:latency4max:%12s\:" % _("Maximum") + " %6.2lf", ++ "GPRINT:latency4min:%12s\:" % _("Minimum") + " %6.2lf", ++ "GPRINT:latency4avg:%12s\:" % _("Average") + " %6.2lf\\n", ++ ++ "AREA:spacer6", ++ "AREA:stddevarea6#00ff0033:STACK", ++ "LINE2:latency6#00ff00:%s" % _("Latency (IPv6)"), ++ "GPRINT:latency6max:%12s\:" % _("Maximum") + " %6.2lf", ++ "GPRINT:latency6min:%12s\:" % _("Minimum") + " %6.2lf", ++ "GPRINT:latency6avg:%12s\:" % _("Average") + " %6.2lf\\n", + ] + + @property + def graph_title(self): +- return _("Latency to %(host)s") ++ return _("Latency to %s") % self.object.hostname + + @property + def graph_vertical_label(self): + return _("Milliseconds") + ++ @property ++ def rrd_graph_args(self): ++ return [ ++ "--legend-direction=bottomup", ++ ] ++ + + class LatencyObject(base.Object): + rrd_schema = [ +- "DS:latency:GAUGE:0:U", +- "DS:latency_loss:GAUGE:0:100", +- "DS:latency_stddev:GAUGE:0:U", ++ "DS:latency6:GAUGE:0:U", ++ "DS:stddev6:GAUGE:0:U", ++ "DS:loss6:GAUGE:0:100", ++ "DS:latency4:GAUGE:0:U", ++ "DS:stddev4:GAUGE:0:U", ++ "DS:loss4:GAUGE:0:100", + ] + + def __repr__(self): + return "<%s %s>" % (self.__class__.__name__, self.hostname) + +- def init(self, hostname, deadline=None): ++ def init(self, hostname): + self.hostname = hostname +- self.deadline = deadline + + @property + def id(self): + return self.hostname + + def collect(self): +- # Send up to five ICMP echo requests. +- try: +- ping = collecty.ping.Ping(destination=self.hostname, timeout=20000) +- ping.run(count=5, deadline=self.deadline) ++ result = [] ++ ++ for family in (socket.AF_INET6, socket.AF_INET): ++ try: ++ p = collecty._collecty.Ping(self.hostname, family=family) ++ p.ping(count=5, deadline=10) ++ ++ result += (p.average, p.stddev, p.loss) ++ ++ except collecty._collecty.PingAddHostError as e: ++ self.log.debug(_("Could not add host %(host)s for family %(family)s") \ ++ % { "host" : self.hostname, "family" : family }) + +- except collecty.ping.PingError as e: +- self.log.warning(_("Could not run latency check for %(host)s: %(msg)s") \ +- % { "host" : self.hostname, "msg" : e.msg }) +- return ++ # No data available ++ result += (None, None, None) ++ continue + +- return ( +- "%.10f" % ping.avg_time, +- "%.10f" % ping.loss, +- "%.10f" % ping.stddev, +- ) ++ except collecty._collecty.PingError as e: ++ self.log.warning(_("Could not run latency check for %(host)s: %(msg)s") \ ++ % { "host" : self.hostname, "msg" : e }) ++ ++ # A hundred percent loss ++ result += (None, None, 1) ++ ++ return result + + + class LatencyPlugin(base.Plugin): +@@ -127,7 +166,5 @@ class LatencyPlugin(base.Plugin): + + @property + def objects(self): +- deadline = self.interval / len(PING_HOSTS) +- + for hostname in PING_HOSTS: +- yield LatencyObject(self, hostname, deadline=deadline) ++ yield LatencyObject(self, hostname) +-- +1.8.1 + diff --git a/liboping/liboping.nm b/liboping/liboping.nm new file mode 100644 index 0000000..a4b4298 --- /dev/null +++ b/liboping/liboping.nm @@ -0,0 +1,50 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = liboping +version = 1.8.0 +release = 1 + +groups = Development/Tools +url = http://noping.cc/ +license = LGPLv2.1 and GPLv2 +summary = liboping is a C library to generate ICMP echo requests + +description + liboping is a C library to generate ICMP echo requests, better known + as 'ping packets'. It is intended for use in network monitoring + applications or applications that would otherwise need to fork ping(1) + frequently. Included is a sample application, called oping, which + demonstrates the library's abilities. It is like ping, ping6, and + fping rolled into one. +end + +source_dl = http://noping.cc/files/ + +build + requires + ncurses-devel + end + + configure_options += \ + --without-perl-bindings + + install_cmds + setcap cap_net_raw=ep %{BUILDROOT}%{bindir}/oping + setcap cap_net_raw=ep %{BUILDROOT}%{bindir}/noping + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a6c59f7b68d1b2d8996d55a7497eb6f25ec0e54e
by git＠ipfire.org 27 Jun '15

27 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via a6c59f7b68d1b2d8996d55a7497eb6f25ec0e54e (commit) via 373788dcd2739e0cebf3247241db40e9803c6705 (commit) via bdb1c525340f70fbc7e00615e23c6e4e22bd07ed (commit) via 19fa533522078560ef17b0a79e2caeffc371b382 (commit) via e265764bfbd332256981312a317b6812104a24ba (commit) via 9cc5fe54aeb906a8183baf42aa34a414c73acc76 (commit) via 25ed6b82c7d6e2ee799a4b69da046e4185333b35 (commit) via dd13db416633e3fb4242c7ff39d235799cd28910 (commit) via eeef5fa660454d9e838ea6e4db4395a2940bc2f4 (commit) via 84c87c3387606a4c1dc8d3e9259755cce2ccfe06 (commit) via 256dcf08cf10f157b038fd41fe7cdb0a5b79a83c (commit) via f3194f517b922a98a5cad199d290169e2e0177f2 (commit) via 5ad3e3d9714c6a951b25e4daed4f83f1fb1f71a2 (commit) via ca263a0ea89342badd761076a334d1d427e17d0b (commit) via 6709c69368acc8a240ef5bbc0f7cbf62fc321422 (commit) via 79f2a76bc303276bf32f103ee081be949a4c69c2 (commit) via 55b550dc1bf9835747013ca968c266226dcf6c46 (commit) from 47437b0c07c31ad8941c893ff2058eeb487a5d63 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a6c59f7b68d1b2d8996d55a7497eb6f25ec0e54e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 27 13:03:42 2015 +0200 core92: Ship updated curl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 373788dcd2739e0cebf3247241db40e9803c6705 Merge: e265764 bdb1c52 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 27 13:01:25 2015 +0200 Merge remote-tracking branch 'mfischer/curl' into next commit bdb1c525340f70fbc7e00615e23c6e4e22bd07ed Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Fri Jun 26 18:07:49 2015 +0200 curl: Update to 7.43.0 commit 19fa533522078560ef17b0a79e2caeffc371b382 Merge: 9cc5fe5 47437b0 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Fri Jun 26 18:06:47 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into curl commit e265764bfbd332256981312a317b6812104a24ba Author: Dirk Wagner <dirk.wagner(a)ipfire.org> Date: Fri Jun 19 12:12:01 2015 +0200 asterisk addon: Update to 11.18.0 commit 9cc5fe54aeb906a8183baf42aa34a414c73acc76 Merge: 25ed6b8 1f02b6e Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sat Jun 20 23:08:05 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 25ed6b82c7d6e2ee799a4b69da046e4185333b35 Merge: dd13db4 5428eee Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Tue Jun 16 21:28:39 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit dd13db416633e3fb4242c7ff39d235799cd28910 Merge: eeef5fa ee299e2 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Tue Jun 16 12:02:42 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit eeef5fa660454d9e838ea6e4db4395a2940bc2f4 Merge: 84c87c3 1f15cc0 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Mon Jun 15 00:43:43 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 84c87c3387606a4c1dc8d3e9259755cce2ccfe06 Merge: 256dcf0 e80a7ef Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Fri May 29 09:18:34 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 256dcf08cf10f157b038fd41fe7cdb0a5b79a83c Merge: f3194f5 031b9f7 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Thu May 28 21:16:06 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit f3194f517b922a98a5cad199d290169e2e0177f2 Merge: 5ad3e3d 38b8efd Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Thu May 28 13:23:47 2015 +0200 Merge remote-tracking branch 'origin' into next commit 5ad3e3d9714c6a951b25e4daed4f83f1fb1f71a2 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun May 17 15:12:16 2015 +0200 graphs.pl: bugfixes regarding rrdtool commit ca263a0ea89342badd761076a334d1d427e17d0b Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Fri May 15 12:43:06 2015 +0200 rrdtool: Update to 1.5.3 commit 6709c69368acc8a240ef5bbc0f7cbf62fc321422 Merge: 79f2a76 81daa02 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Wed May 27 22:23:51 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 79f2a76bc303276bf32f103ee081be949a4c69c2 Merge: 55b550d 4ec8107 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Thu May 21 21:18:37 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 55b550dc1bf9835747013ca968c266226dcf6c46 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun May 17 15:12:16 2015 +0200 graphs.pl: bugfixes regarding rrdtool ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/curl | 8 ++++++++ config/rootfiles/{oldcore/90 => core/92}/filelists/curl | 0 config/rootfiles/packages/asterisk | 8 ++++---- lfs/asterisk | 6 +++--- lfs/curl | 4 ++-- 5 files changed, 17 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/90 => core/92}/filelists/curl (100%) Difference in files: diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index af32dfa..0fd2819 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -144,6 +144,9 @@ usr/lib/libcurl.so.4.3.0 #usr/share/man/man3/CURLOPT_OPENSOCKETDATA.3 #usr/share/man/man3/CURLOPT_OPENSOCKETFUNCTION.3 #usr/share/man/man3/CURLOPT_PASSWORD.3 +#usr/share/man/man3/CURLOPT_PATH_AS_IS.3 +#usr/share/man/man3/CURLOPT_PINNEDPUBLICKEY.3 +#usr/share/man/man3/CURLOPT_PIPEWAIT.3 #usr/share/man/man3/CURLOPT_PORT.3 #usr/share/man/man3/CURLOPT_POST.3 #usr/share/man/man3/CURLOPT_POSTFIELDS.3 @@ -164,6 +167,7 @@ usr/lib/libcurl.so.4.3.0 #usr/share/man/man3/CURLOPT_PROXYTYPE.3 #usr/share/man/man3/CURLOPT_PROXYUSERNAME.3 #usr/share/man/man3/CURLOPT_PROXYUSERPWD.3 +#usr/share/man/man3/CURLOPT_PROXY_SERVICE_NAME.3 #usr/share/man/man3/CURLOPT_PROXY_TRANSFER_MODE.3 #usr/share/man/man3/CURLOPT_PUT.3 #usr/share/man/man3/CURLOPT_QUOTE.3 @@ -185,6 +189,7 @@ usr/lib/libcurl.so.4.3.0 #usr/share/man/man3/CURLOPT_SASL_IR.3 #usr/share/man/man3/CURLOPT_SEEKDATA.3 #usr/share/man/man3/CURLOPT_SEEKFUNCTION.3 +#usr/share/man/man3/CURLOPT_SERVICE_NAME.3 #usr/share/man/man3/CURLOPT_SHARE.3 #usr/share/man/man3/CURLOPT_SOCKOPTDATA.3 #usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3 @@ -209,10 +214,12 @@ usr/lib/libcurl.so.4.3.0 #usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3 #usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3 #usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3 +#usr/share/man/man3/CURLOPT_SSL_FALSESTART.3 #usr/share/man/man3/CURLOPT_SSL_OPTIONS.3 #usr/share/man/man3/CURLOPT_SSL_SESSIONID_CACHE.3 #usr/share/man/man3/CURLOPT_SSL_VERIFYHOST.3 #usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3 +#usr/share/man/man3/CURLOPT_SSL_VERIFYSTATUS.3 #usr/share/man/man3/CURLOPT_STDERR.3 #usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3 #usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3 @@ -296,5 +303,6 @@ usr/lib/libcurl.so.4.3.0 #usr/share/man/man3/libcurl-errors.3 #usr/share/man/man3/libcurl-multi.3 #usr/share/man/man3/libcurl-share.3 +#usr/share/man/man3/libcurl-symbols.3 #usr/share/man/man3/libcurl-tutorial.3 #usr/share/man/man3/libcurl.3 diff --git a/config/rootfiles/core/92/filelists/curl b/config/rootfiles/core/92/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/core/92/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 6654621..de75232 100755 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -835,15 +835,15 @@ var/lib/asterisk/sounds/digits/de/xh-8x.gsm var/lib/asterisk/sounds/digits/de/xh-9x.gsm var/lib/asterisk/sounds/digits/de/yesterday.gsm var/lib/asterisk/sounds/en -var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26 +var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.27 var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.15 var/lib/asterisk/sounds/en/1-for-am-2-for-pm.gsm var/lib/asterisk/sounds/en/1-yes-2-no.gsm -#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26 +#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.27 #var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15 -#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26 +#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.27 #var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15 -#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26 +#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.27 #var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15 var/lib/asterisk/sounds/en/OfficeSpace.gsm var/lib/asterisk/sounds/en/Randulo-allison.gsm diff --git a/lfs/asterisk b/lfs/asterisk index 7575246..154fe77 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -20,7 +20,7 @@ include Config -VER = 11.17.1 +VER = 11.18.0 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -28,7 +28,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 16 +PAK_VER = 17 DEPS = "libsrtp" @@ -46,7 +46,7 @@ asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz -$(DL_FILE)_MD5 = 2c6cd0f499152d0d5ff32f36e274fc2e +$(DL_FILE)_MD5 = 3ddb42b54db200faccd68906df210a40 asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c diff --git a/lfs/curl b/lfs/curl index 0fd92c1..7de9aa3 100644 --- a/lfs/curl +++ b/lfs/curl @@ -24,7 +24,7 @@ include Config -VER = 7.40.0 +VER = 7.43.0 THISAPP = curl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 58943642ea0ed050ab0431ea1caf3a6f +$(DL_FILE)_MD5 = 3037f0b6ce03d434618e9db5506ae6be install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5019890f4f2e189347fd3fde6f3ea1a45bbd524a
by git＠ipfire.org 23 Jun '15

23 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 5019890f4f2e189347fd3fde6f3ea1a45bbd524a (commit) via 99b9e7ab620805b76494c0aeafc7affba0acf447 (commit) via 8e599c5c1786acdcd945489d5ab61daf8f9a2f93 (commit) via f192186c76356d9127f12e9a7074fa638cd497c0 (commit) via f766f0d337331f09ae44aeabc9ab32f70942ca5d (commit) via e0911c19345e9dc1d45ef4a021f66328974812d7 (commit) via dc75ef006b9b1c4794e59ebacd811c61b463c586 (commit) from 56f487169c8b37e78c02bbcea3e79b44ebf3b053 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5019890f4f2e189347fd3fde6f3ea1a45bbd524a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 22:59:53 2015 +0000 git: Install git-email automatically and add its dependencies Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 99b9e7ab620805b76494c0aeafc7affba0acf447 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 22:59:29 2015 +0000 perl-GSSAPI: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8e599c5c1786acdcd945489d5ab61daf8f9a2f93 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 22:59:00 2015 +0000 perl-Digest-HMAC: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f192186c76356d9127f12e9a7074fa638cd497c0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 22:58:34 2015 +0000 perl-Authen-SASL: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f766f0d337331f09ae44aeabc9ab32f70942ca5d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 22:58:05 2015 +0000 perl-Net-SSLeay: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e0911c19345e9dc1d45ef4a021f66328974812d7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 22:57:36 2015 +0000 perl-IO-Socket-SSL: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dc75ef006b9b1c4794e59ebacd811c61b463c586 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 22:56:42 2015 +0000 perl-Net-SMTP-SSL: New package Required by git send-email Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: git/git.nm | 7 +++- .../patches/Authen-SASL-RT85294-Fix-WRITE.patch | 13 ++++++++ .../perl-Authen-SASL.nm | 26 ++++++++------- .../perl-Digest-HMAC.nm | 27 ++++++++------- perl-BDB/perl-BDB.nm => perl-GSSAPI/perl-GSSAPI.nm | 38 ++++++++-------------- .../perl-IO-Socket-SSL.nm | 27 ++++++++------- .../perl-Net-SMTP-SSL.nm | 24 +++++++------- .../perl-Net-SSLeay.nm | 33 ++++++++----------- 8 files changed, 106 insertions(+), 89 deletions(-) create mode 100644 perl-Authen-SASL/patches/Authen-SASL-RT85294-Fix-WRITE.patch copy perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm => perl-Authen-SASL/perl-Authen-SASL.nm (51%) copy perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm => perl-Digest-HMAC/perl-Digest-HMAC.nm (50%) copy perl-BDB/perl-BDB.nm => perl-GSSAPI/perl-GSSAPI.nm (50%) copy perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm => perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm (50%) copy perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm => perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm (57%) copy perl-FCGI/perl-FCGI.nm => perl-Net-SSLeay/perl-Net-SSLeay.nm (53%) Difference in files: diff --git a/git/git.nm b/git/git.nm index cae8af2..9c0b341 100644 --- a/git/git.nm +++ b/git/git.nm @@ -5,7 +5,7 @@ name = git version = 1.8.1 -release = 3 +release = 4 groups = Development/Tools url = http://git-scm.com/ @@ -94,6 +94,9 @@ packages /usr/bin/vi end + recommends + %{name}-email + end end package %{name}-daemon @@ -194,6 +197,8 @@ packages requires git=%{thisver} perl-Git=%{thisver} + perl(Authen::SASL) + perl(Net::SMTP::SSL) end files diff --git a/perl-Authen-SASL/patches/Authen-SASL-RT85294-Fix-WRITE.patch b/perl-Authen-SASL/patches/Authen-SASL-RT85294-Fix-WRITE.patch new file mode 100644 index 0000000..0093ad2 --- /dev/null +++ b/perl-Authen-SASL/patches/Authen-SASL-RT85294-Fix-WRITE.patch @@ -0,0 +1,13 @@ +diff -up Authen-SASL-2.16/lib/Authen/SASL/Perl.pm.orig Authen-SASL-2.16/lib/Authen/SASL/Perl.pm +--- Authen-SASL-2.16/lib/Authen/SASL/Perl.pm.orig 2012-09-04 18:00:31.000000000 +0200 ++++ Authen-SASL-2.16/lib/Authen/SASL/Perl.pm 2014-06-04 09:51:34.654310724 +0200 +@@ -323,6 +323,9 @@ sub securesocket { + + my $fh = $self->{fh}; + ++ # Fix for BZ#965739, RT#85294 ++ $len = length($_[1]) if $len > length($_[1]); ++ + # put on wire in peer-sized chunks + my $bsz = $self->{sndbufsz}; + while ($len > 0) { diff --git a/perl-Authen-SASL/perl-Authen-SASL.nm b/perl-Authen-SASL/perl-Authen-SASL.nm new file mode 100644 index 0000000..b14f174 --- /dev/null +++ b/perl-Authen-SASL/perl-Authen-SASL.nm @@ -0,0 +1,42 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = perl-Authen-SASL +version = 2.16 +release = 1 +arch = noarch +thisapp = Authen-SASL-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/dist/Authen-SASL/ +license = GPL+ or Artistic +summary = SASL Authentication framework for Perl + +description + SASL is a generic mechanism for authentication used by several + network protocols. Authen::SASL provides an implementation framework + that all protocols should be able to share. +end + +source_dl = http://www.cpan.org/authors/id/G/GB/GBARR/ + +build + requires + perl(Digest::HMAC) + perl(Digest::MD5) + perl(ExtUtils::MakeMaker) + perl(File::Path) + perl(GSSAPI) + end + + build + perl Makefile.PL INSTALLDIRS=vendor + make %{PARALLELISMFLAGS} + end +end + +packages + package %{name} +end diff --git a/perl-Digest-HMAC/perl-Digest-HMAC.nm b/perl-Digest-HMAC/perl-Digest-HMAC.nm new file mode 100644 index 0000000..5f1ce5f --- /dev/null +++ b/perl-Digest-HMAC/perl-Digest-HMAC.nm @@ -0,0 +1,45 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = perl-Digest-HMAC +version = 1.03 +release = 1 +arch = noarch +thisapp = Digest-HMAC-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/dist/Digest-HMAC/ +license = GPL+ or Artistic +summary = Keyed-Hashing for Message Authentication + +description + HMAC is used for message integrity checks between two parties that + share a secret key, and works in combination with some other Digest + algorithm, usually MD5 or SHA-1. The HMAC mechanism is described in + RFC 2104. +end + +source_dl = http://www.cpan.org/authors/id/G/GA/GAAS/ + +build + requires + perl(Digest::MD5) + perl(Digest::SHA1) + perl(ExtUtils::MakeMaker) + end + + build + perl Makefile.PL INSTALLDIRS=vendor + make %{PARALLELISMFLAGS} + end + + test + make test + end +end + +packages + package %{name} +end diff --git a/perl-GSSAPI/perl-GSSAPI.nm b/perl-GSSAPI/perl-GSSAPI.nm new file mode 100644 index 0000000..ca2e5de --- /dev/null +++ b/perl-GSSAPI/perl-GSSAPI.nm @@ -0,0 +1,44 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = perl-GSSAPI +version = 0.28 +release = 1 +thisapp = GSSAPI-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/dist/GSSAPI +license = GPL+ or Artistic +summary = Perl extension providing access to the GSSAPIv2 library + +description + This module gives access to the routines of the GSSAPI library, as + described in rfc2743 and rfc2744 and implemented by the Kerberos-1.2 + distribution from MIT. +end + +source_dl = http://www.cpan.org/authors/id/A/AG/AGROLMS/ + +build + requires + krb5-devel + perl(ExtUtils::MakeMaker) + perl(Test::More) >= 0.47 + end + + build + PERL_MM_USE_DEFAULT=1 perl Makefile.PL \ + INSTALLDIRS=vendor OPTIMIZE="%{CFLAGS}" + make %{PARALLELISMFLAGS} + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm b/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm new file mode 100644 index 0000000..dd8585d --- /dev/null +++ b/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm @@ -0,0 +1,45 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = perl-IO-Socket-SSL +version = 2.016 +release = 1 +arch = noarch +thisapp = IO-Socket-SSL-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/~sullr/%{thisapp}/ +license = GPL+ or Artistic +summary = SSL sockets with IO::Socket interface + +description + IO::Socket::SSL makes using SSL/TLS much easier by wrapping the + necessary functionality into the familiar IO::Socket interface and + providing secure defaults whenever possible. +end + +source_dl = http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/ + +build + requires + perl(ExtUtils::MakeMaker) + perl(Net::SSLeay) + perl(Test::More) >= 0.47 + perl(URI) >= 1.50 + end + + build + perl Makefile.PL INSTALLDIRS=vendor + make %{PARALLELISMFLAGS} + end + + test + make test + end +end + +packages + package %{name} +end diff --git a/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm b/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm new file mode 100644 index 0000000..f6ea363 --- /dev/null +++ b/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm @@ -0,0 +1,42 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = perl-Net-SMTP-SSL +version = 1.03 +release = 1 +arch = noarch +thisapp = Net-SMTP-SSL-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/~rjbs/%{thisapp}/ +license = GPL+ or Artistic +summary = SSL support for Net::SMTP + +description + Adds SSL support for the Net::SMTP perl module. +end + +source_dl = http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/ + +build + requires + perl(ExtUtils::MakeMaker) + perl(IO::Socket::SSL) + perl(Test::More) >= 0.47 + end + + build + perl Makefile.PL INSTALLDIRS=vendor + make %{PARALLELISMFLAGS} + end + + test + make test + end +end + +packages + package %{name} +end diff --git a/perl-Net-SSLeay/perl-Net-SSLeay.nm b/perl-Net-SSLeay/perl-Net-SSLeay.nm new file mode 100644 index 0000000..5a6e166 --- /dev/null +++ b/perl-Net-SSLeay/perl-Net-SSLeay.nm @@ -0,0 +1,47 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = perl-Net-SSLeay +version = 1.69 +release = 1 +thisapp = Net-SSLeay-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/~flora/Net_SSLeay.pm/ +license = GPL+ or Artistic +summary = Perl extension for using OpenSSL + +description + Net::SSLeay module contains perl bindings to openssl library. +end + +source_dl = http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/ + +build + requires + openssl-devel + perl(ExtUtils::MakeMaker) + perl(Test::More) >= 0.47 + zlib-devel + end + + build + PERL_MM_USE_DEFAULT=1 perl Makefile.PL \ + INSTALLDIRS=vendor OPTIMIZE="%{CFLAGS}" + make %{PARALLELISMFLAGS} + end + + test + make test + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 47437b0c07c31ad8941c893ff2058eeb487a5d63
by git＠ipfire.org 23 Jun '15

23 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 47437b0c07c31ad8941c893ff2058eeb487a5d63 (commit) via e53a08983c38e3e989da3f847064a3a80fc78d36 (commit) via 60e957d0550eff7fb73f0245798b073d291a084a (commit) via f4e1fbab9e1d09deb44d63895ecc29bbfaf58b94 (commit) via 0818bf1120a3e09a29e101ad399f5c5033fc63a3 (commit) via 39a92aabc20996e38c44c8101241318609d138b4 (commit) via fec7a5b72f3c414d92a5a2d925b001c4705dc0a8 (commit) via 0af0f28ab0499b3ce70a18ef61290caeb6b2a6b1 (commit) via ead1c73f2ae606d24b6f812168083cd17d660672 (commit) via d2f2ca6560d85ba74376792c1d5f5a7f1dc8887a (commit) via b5722656633c1bd4386b827a608c6966bde37be6 (commit) via 4ebb37c8ad321f185618349121ebd074df37e5e6 (commit) from 1f02b6e0e15f06284d865247a06457acbb98c1a0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 47437b0c07c31ad8941c893ff2058eeb487a5d63 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 23:11:36 2015 +0200 core92: Ship python Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e53a08983c38e3e989da3f847064a3a80fc78d36 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 23:11:16 2015 +0200 core92: Ship libnetfilter_cttimeout Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 60e957d0550eff7fb73f0245798b073d291a084a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 23:10:08 2015 +0200 core92: Ship iptables again Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f4e1fbab9e1d09deb44d63895ecc29bbfaf58b94 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 20:14:53 2015 +0200 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0818bf1120a3e09a29e101ad399f5c5033fc63a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 14:48:56 2015 +0200 keepalived: Update to 1.2.17 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 39a92aabc20996e38c44c8101241318609d138b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 14:45:06 2015 +0200 conntrack-tools: Update to 1.4.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fec7a5b72f3c414d92a5a2d925b001c4705dc0a8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 14:01:44 2015 +0200 libnetfilter_cthelper: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0af0f28ab0499b3ce70a18ef61290caeb6b2a6b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 13:58:41 2015 +0200 iptables: Cleanup make file Just some reindentation but no functional changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ead1c73f2ae606d24b6f812168083cd17d660672 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 13:56:46 2015 +0200 libnetfilter_cttimeout: Move out of iptables package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d2f2ca6560d85ba74376792c1d5f5a7f1dc8887a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 13:51:50 2015 +0200 libnetfilter_queue: Update to version 1.0.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b5722656633c1bd4386b827a608c6966bde37be6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 13:46:46 2015 +0200 libnetfilter_conntrack: Update to version 1.0.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4ebb37c8ad321f185618349121ebd074df37e5e6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 23 13:37:09 2015 +0200 libnfnetlink: Update to 1.0.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/conntrack-tools | 11 +++- config/rootfiles/common/iptables | 45 ++------------ config/rootfiles/common/libnetfilter_conntrack | 15 +++++ config/rootfiles/common/libnetfilter_cthelper | 7 +++ config/rootfiles/common/libnetfilter_cttimeout | 7 +++ config/rootfiles/common/libnetfilter_queue | 14 +++++ config/rootfiles/common/libnfnetlink | 9 +++ config/rootfiles/common/python | 2 +- .../66 => core/92}/filelists/conntrack-tools | 0 .../{oldcore/90 => core/92}/filelists/iptables | 0 .../core/92/filelists/libnetfilter_conntrack | 1 + .../core/92/filelists/libnetfilter_cthelper | 1 + .../core/92/filelists/libnetfilter_cttimeout | 1 + .../rootfiles/core/92/filelists/libnetfilter_queue | 1 + config/rootfiles/core/92/filelists/libnfnetlink | 1 + .../{oldcore/59 => core/92}/filelists/python | 0 config/rootfiles/packages/keepalived | 4 +- config/rootfiles/packages/powertop | 35 ++++++----- lfs/conntrack-tools | 4 +- lfs/iptables | 72 +++++----------------- lfs/keepalived | 6 +- lfs/{conntrack-tools => libnetfilter_conntrack} | 6 +- lfs/{conntrack-tools => libnetfilter_cthelper} | 6 +- lfs/{conntrack-tools => libnetfilter_cttimeout} | 6 +- lfs/{conntrack-tools => libnetfilter_queue} | 6 +- lfs/{libmnl => libnfnetlink} | 6 +- make.sh | 5 ++ 27 files changed, 135 insertions(+), 136 deletions(-) create mode 100644 config/rootfiles/common/libnetfilter_conntrack create mode 100644 config/rootfiles/common/libnetfilter_cthelper create mode 100644 config/rootfiles/common/libnetfilter_cttimeout create mode 100644 config/rootfiles/common/libnetfilter_queue create mode 100644 config/rootfiles/common/libnfnetlink copy config/rootfiles/{oldcore/66 => core/92}/filelists/conntrack-tools (100%) copy config/rootfiles/{oldcore/90 => core/92}/filelists/iptables (100%) create mode 120000 config/rootfiles/core/92/filelists/libnetfilter_conntrack create mode 120000 config/rootfiles/core/92/filelists/libnetfilter_cthelper create mode 120000 config/rootfiles/core/92/filelists/libnetfilter_cttimeout create mode 120000 config/rootfiles/core/92/filelists/libnetfilter_queue create mode 120000 config/rootfiles/core/92/filelists/libnfnetlink copy config/rootfiles/{oldcore/59 => core/92}/filelists/python (100%) copy lfs/{conntrack-tools => libnetfilter_conntrack} (96%) copy lfs/{conntrack-tools => libnetfilter_cthelper} (96%) copy lfs/{conntrack-tools => libnetfilter_cttimeout} (96%) copy lfs/{conntrack-tools => libnetfilter_queue} (96%) copy lfs/{libmnl => libnfnetlink} (96%) Difference in files: diff --git a/config/rootfiles/common/conntrack-tools b/config/rootfiles/common/conntrack-tools index 5ce29aa..52b642a 100644 --- a/config/rootfiles/common/conntrack-tools +++ b/config/rootfiles/common/conntrack-tools @@ -1,6 +1,13 @@ +#usr/lib/conntrack-tools +#usr/lib/conntrack-tools/ct_helper_ftp.la +usr/lib/conntrack-tools/ct_helper_ftp.so +#usr/lib/conntrack-tools/ct_helper_rpc.la +usr/lib/conntrack-tools/ct_helper_rpc.so +#usr/lib/conntrack-tools/ct_helper_tns.la +usr/lib/conntrack-tools/ct_helper_tns.so usr/sbin/conntrack -#usr/sbin/conntrackd -#usr/sbin/nfct +usr/sbin/conntrackd +usr/sbin/nfct #usr/share/man/man8/conntrack.8 #usr/share/man/man8/conntrackd.8 #usr/share/man/man8/nfct.8 diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables index a0f1290..09e827c 100644 --- a/config/rootfiles/common/iptables +++ b/config/rootfiles/common/iptables @@ -54,7 +54,6 @@ lib/xtables #lib/xtables/libipt_ULOG.so #lib/xtables/libipt_ah.so #lib/xtables/libipt_icmp.so -#lib/xtables/libipt_ipp2p.so #lib/xtables/libipt_realm.so #lib/xtables/libipt_ttl.so #lib/xtables/libipt_unclean.so @@ -88,6 +87,7 @@ lib/xtables #lib/xtables/libxt_cluster.so #lib/xtables/libxt_comment.so #lib/xtables/libxt_connbytes.so +#lib/xtables/libxt_connlabel.so #lib/xtables/libxt_connlimit.so #lib/xtables/libxt_connmark.so #lib/xtables/libxt_conntrack.so @@ -137,6 +137,7 @@ sbin/iptables sbin/iptables-restore sbin/iptables-save sbin/iptables-xml +#sbin/nfnl_osf sbin/xtables-multi #usr/include/libipq.h #usr/include/libiptc @@ -145,52 +146,12 @@ sbin/xtables-multi #usr/include/libiptc/libiptc.h #usr/include/libiptc/libxtc.h #usr/include/libiptc/xtcshared.h -#usr/include/libnetfilter_conntrack -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h -#usr/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h -#usr/include/libnetfilter_cttimeout -#usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h -#usr/include/libnetfilter_queue -#usr/include/libnetfilter_queue/libnetfilter_queue.h -#usr/include/libnetfilter_queue/linux_nfnetlink_queue.h -#usr/include/libnfnetlink -#usr/include/libnfnetlink/libnfnetlink.h -#usr/include/libnfnetlink/linux_nfnetlink.h -#usr/include/libnfnetlink/linux_nfnetlink_compat.h #usr/include/xtables-version.h #usr/include/xtables.h -#usr/lib/libnetfilter_conntrack.la -usr/lib/libnetfilter_conntrack.so -usr/lib/libnetfilter_conntrack.so.3 -usr/lib/libnetfilter_conntrack.so.3.4.0 -#usr/lib/libnetfilter_cttimeout.la -usr/lib/libnetfilter_cttimeout.so -usr/lib/libnetfilter_cttimeout.so.1 -usr/lib/libnetfilter_cttimeout.so.1.0.0 -#usr/lib/libnetfilter_queue.la -usr/lib/libnetfilter_queue.so -usr/lib/libnetfilter_queue.so.1 -usr/lib/libnetfilter_queue.so.1.2.0 -#usr/lib/libnfnetlink.a -#usr/lib/libnfnetlink.la -usr/lib/libnfnetlink.so -usr/lib/libnfnetlink.so.0 -usr/lib/libnfnetlink.so.0.2.0 #usr/lib/pkgconfig/libip4tc.pc #usr/lib/pkgconfig/libip6tc.pc #usr/lib/pkgconfig/libipq.pc #usr/lib/pkgconfig/libiptc.pc -#usr/lib/pkgconfig/libnetfilter_conntrack.pc -#usr/lib/pkgconfig/libnetfilter_cttimeout.pc -#usr/lib/pkgconfig/libnetfilter_queue.pc -#usr/lib/pkgconfig/libnfnetlink.pc #usr/lib/pkgconfig/xtables.pc #usr/share/man/man1/iptables-xml.1 #usr/share/man/man3/ipq_create_handle.3 @@ -211,3 +172,5 @@ usr/lib/libnfnetlink.so.0.2.0 #usr/share/man/man8/iptables-restore.8 #usr/share/man/man8/iptables-save.8 #usr/share/man/man8/iptables.8 +#usr/share/xtables +usr/share/xtables/pf.os diff --git a/config/rootfiles/common/libnetfilter_conntrack b/config/rootfiles/common/libnetfilter_conntrack new file mode 100644 index 0000000..6095d0b --- /dev/null +++ b/config/rootfiles/common/libnetfilter_conntrack @@ -0,0 +1,15 @@ +#usr/include/libnetfilter_conntrack +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h +#usr/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +#usr/lib/libnetfilter_conntrack.la +#usr/lib/libnetfilter_conntrack.so +usr/lib/libnetfilter_conntrack.so.3 +usr/lib/libnetfilter_conntrack.so.3.5.0 +#usr/lib/pkgconfig/libnetfilter_conntrack.pc diff --git a/config/rootfiles/common/libnetfilter_cthelper b/config/rootfiles/common/libnetfilter_cthelper new file mode 100644 index 0000000..4e2e9e5 --- /dev/null +++ b/config/rootfiles/common/libnetfilter_cthelper @@ -0,0 +1,7 @@ +#usr/include/libnetfilter_cthelper +#usr/include/libnetfilter_cthelper/libnetfilter_cthelper.h +#usr/lib/libnetfilter_cthelper.la +#usr/lib/libnetfilter_cthelper.so +usr/lib/libnetfilter_cthelper.so.0 +usr/lib/libnetfilter_cthelper.so.0.0.0 +#usr/lib/pkgconfig/libnetfilter_cthelper.pc diff --git a/config/rootfiles/common/libnetfilter_cttimeout b/config/rootfiles/common/libnetfilter_cttimeout new file mode 100644 index 0000000..f1647d1 --- /dev/null +++ b/config/rootfiles/common/libnetfilter_cttimeout @@ -0,0 +1,7 @@ +#usr/include/libnetfilter_cttimeout +#usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h +#usr/lib/libnetfilter_cttimeout.la +#usr/lib/libnetfilter_cttimeout.so +usr/lib/libnetfilter_cttimeout.so.1 +usr/lib/libnetfilter_cttimeout.so.1.0.0 +#usr/lib/pkgconfig/libnetfilter_cttimeout.pc diff --git a/config/rootfiles/common/libnetfilter_queue b/config/rootfiles/common/libnetfilter_queue new file mode 100644 index 0000000..418a5df --- /dev/null +++ b/config/rootfiles/common/libnetfilter_queue @@ -0,0 +1,14 @@ +#usr/include/internal.h +#usr/include/libnetfilter_queue +#usr/include/libnetfilter_queue/libnetfilter_queue.h +#usr/include/libnetfilter_queue/libnetfilter_queue_ipv4.h +#usr/include/libnetfilter_queue/libnetfilter_queue_ipv6.h +#usr/include/libnetfilter_queue/libnetfilter_queue_tcp.h +#usr/include/libnetfilter_queue/libnetfilter_queue_udp.h +#usr/include/libnetfilter_queue/linux_nfnetlink_queue.h +#usr/include/libnetfilter_queue/pktbuff.h +#usr/lib/libnetfilter_queue.la +#usr/lib/libnetfilter_queue.so +usr/lib/libnetfilter_queue.so.1 +usr/lib/libnetfilter_queue.so.1.3.0 +#usr/lib/pkgconfig/libnetfilter_queue.pc diff --git a/config/rootfiles/common/libnfnetlink b/config/rootfiles/common/libnfnetlink new file mode 100644 index 0000000..ad97cb5 --- /dev/null +++ b/config/rootfiles/common/libnfnetlink @@ -0,0 +1,9 @@ +#usr/include/libnfnetlink +#usr/include/libnfnetlink/libnfnetlink.h +#usr/include/libnfnetlink/linux_nfnetlink.h +#usr/include/libnfnetlink/linux_nfnetlink_compat.h +#usr/lib/libnfnetlink.la +#usr/lib/libnfnetlink.so +usr/lib/libnfnetlink.so.0 +usr/lib/libnfnetlink.so.0.2.0 +#usr/lib/pkgconfig/libnfnetlink.pc diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python index 6542f0d..a308ae0 100644 --- a/config/rootfiles/common/python +++ b/config/rootfiles/common/python @@ -181,7 +181,7 @@ usr/lib/python2.7/_pyio.pyc usr/lib/python2.7/_strptime.pyc #usr/lib/python2.7/_strptime.pyo #usr/lib/python2.7/_sysconfigdata.py -#usr/lib/python2.7/_sysconfigdata.pyc +usr/lib/python2.7/_sysconfigdata.pyc #usr/lib/python2.7/_sysconfigdata.pyo #usr/lib/python2.7/_threading_local.py usr/lib/python2.7/_threading_local.pyc diff --git a/config/rootfiles/core/92/filelists/conntrack-tools b/config/rootfiles/core/92/filelists/conntrack-tools new file mode 120000 index 0000000..88fbe06 --- /dev/null +++ b/config/rootfiles/core/92/filelists/conntrack-tools @@ -0,0 +1 @@ +../../../common/conntrack-tools \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/iptables b/config/rootfiles/core/92/filelists/iptables new file mode 120000 index 0000000..8caf12b --- /dev/null +++ b/config/rootfiles/core/92/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libnetfilter_conntrack b/config/rootfiles/core/92/filelists/libnetfilter_conntrack new file mode 120000 index 0000000..6ef5cc4 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnetfilter_conntrack @@ -0,0 +1 @@ +../../../common/libnetfilter_conntrack \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libnetfilter_cthelper b/config/rootfiles/core/92/filelists/libnetfilter_cthelper new file mode 120000 index 0000000..02fac03 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnetfilter_cthelper @@ -0,0 +1 @@ +../../../common/libnetfilter_cthelper \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libnetfilter_cttimeout b/config/rootfiles/core/92/filelists/libnetfilter_cttimeout new file mode 120000 index 0000000..6b1b980 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnetfilter_cttimeout @@ -0,0 +1 @@ +../../../common/libnetfilter_cttimeout \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libnetfilter_queue b/config/rootfiles/core/92/filelists/libnetfilter_queue new file mode 120000 index 0000000..9344b04 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnetfilter_queue @@ -0,0 +1 @@ +../../../common/libnetfilter_queue \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libnfnetlink b/config/rootfiles/core/92/filelists/libnfnetlink new file mode 120000 index 0000000..605e72d --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnfnetlink @@ -0,0 +1 @@ +../../../common/libnfnetlink \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/python b/config/rootfiles/core/92/filelists/python new file mode 120000 index 0000000..ffe6e2c --- /dev/null +++ b/config/rootfiles/core/92/filelists/python @@ -0,0 +1 @@ +../../../common/python \ No newline at end of file diff --git a/config/rootfiles/packages/keepalived b/config/rootfiles/packages/keepalived index 410128b..88cfeed 100644 --- a/config/rootfiles/packages/keepalived +++ b/config/rootfiles/packages/keepalived @@ -26,12 +26,12 @@ etc/keepalived/samples #etc/keepalived/samples/keepalived.conf.vrrp.sync #etc/keepalived/samples/root.pem #etc/keepalived/samples/sample.misccheck.smbcheck.sh -#etc/rc.d/init.d/keepalived -#etc/sysconfig #etc/sysconfig/keepalived usr/bin/genhash usr/sbin/keepalived #usr/share/man/man1/genhash.1 #usr/share/man/man5/keepalived.conf.5 #usr/share/man/man8/keepalived.8 +#usr/share/snmp/mibs/KEEPALIVED-MIB +#usr/share/snmp/mibs/VRRP-MIB var/ipfire/backup/addons/includes/keepalived diff --git a/config/rootfiles/packages/powertop b/config/rootfiles/packages/powertop index d14bcee..b7d2550 100644 --- a/config/rootfiles/packages/powertop +++ b/config/rootfiles/packages/powertop @@ -1,17 +1,22 @@ usr/sbin/powertop -#usr/share/locale/de/LC_MESSAGES/powertop.mo -#usr/share/locale/es/LC_MESSAGES/powertop.mo -#usr/share/locale/fi/LC_MESSAGES/powertop.mo -#usr/share/locale/fr/LC_MESSAGES/powertop.mo -#usr/share/locale/hu/LC_MESSAGES/powertop.mo -#usr/share/locale/id/LC_MESSAGES/powertop.mo -#usr/share/locale/it/LC_MESSAGES/powertop.mo -#usr/share/locale/ja/LC_MESSAGES/powertop.mo -#usr/share/locale/nl/LC_MESSAGES/powertop.mo -#usr/share/locale/pl/LC_MESSAGES/powertop.mo -#usr/share/locale/pt_BR/LC_MESSAGES/powertop.mo -#usr/share/locale/ro/LC_MESSAGES/powertop.mo -#usr/share/locale/ru/LC_MESSAGES/powertop.mo -#usr/share/locale/zh_CN/LC_MESSAGES/powertop.mo +#usr/share/locale/ca/LC_MESSAGES/powertop.mo +#usr/share/locale/cs_CZ/LC_MESSAGES/powertop.mo +#usr/share/locale/de_DE +#usr/share/locale/de_DE/LC_MESSAGES +#usr/share/locale/de_DE/LC_MESSAGES/powertop.mo +#usr/share/locale/en_GB/LC_MESSAGES/powertop.mo +#usr/share/locale/en_US/LC_MESSAGES/powertop.mo +#usr/share/locale/es_ES +#usr/share/locale/es_ES/LC_MESSAGES +#usr/share/locale/es_ES/LC_MESSAGES/powertop.mo +#usr/share/locale/hu_HU +#usr/share/locale/hu_HU/LC_MESSAGES +#usr/share/locale/hu_HU/LC_MESSAGES/powertop.mo +#usr/share/locale/id_ID +#usr/share/locale/id_ID/LC_MESSAGES +#usr/share/locale/id_ID/LC_MESSAGES/powertop.mo +#usr/share/locale/nl_NL +#usr/share/locale/nl_NL/LC_MESSAGES +#usr/share/locale/nl_NL/LC_MESSAGES/powertop.mo #usr/share/locale/zh_TW/LC_MESSAGES/powertop.mo -#usr/share/man/man8/powertop.8.gz +#usr/share/man/man8/powertop.8 diff --git a/lfs/conntrack-tools b/lfs/conntrack-tools index f5ea315..d9a60bc 100644 --- a/lfs/conntrack-tools +++ b/lfs/conntrack-tools @@ -24,7 +24,7 @@ include Config -VER = 1.2.2 +VER = 1.4.2 THISAPP = conntrack-tools-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a8afc813e16265655f83991fc0df35b6 +$(DL_FILE)_MD5 = b1f9d006e7bf000a77395ff7cd3fac16 install : $(TARGET) diff --git a/lfs/iptables b/lfs/iptables index ec65ae0..b7ce928 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -35,26 +35,14 @@ TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) \ - netfilter-layer7-v2.22.tar.gz \ - libnfnetlink-1.0.0.tar.bz2 \ - libnetfilter_queue-1.0.1.tar.bz2 \ - libnetfilter_conntrack-1.0.2.tar.bz2 \ - libnetfilter_cttimeout-1.0.0.tar.bz2 +objects = $(DL_FILE) \ + netfilter-layer7-v2.22.tar.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz -libnfnetlink-1.0.0.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-1.0.0.tar.bz2 -libnetfilter_queue-1.0.1.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-1.0.1.tar.bz2 -libnetfilter_conntrack-1.0.2.tar.bz2 = $(URL_IPFIRE)/libnetfilter_conntrack-1.0.2.tar.bz2 -libnetfilter_cttimeout-1.0.0.tar.bz2 = $(URL_IPFIRE)/libnetfilter_cttimeout-1.0.0.tar.bz2 +netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz $(DL_FILE)_MD5 = 536d048c8e8eeebcd9757d0863ebb0c0 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f -libnfnetlink-1.0.0.tar.bz2_MD5 = 016fdec8389242615024c529acc1adb8 -libnetfilter_queue-1.0.1.tar.bz2_MD5 = 08b968cb2d36c24deb7f26a69f5d8602 -libnetfilter_conntrack-1.0.2.tar.bz2_MD5 = 447114b5d61bb9a9617ead3217c3d3ff -libnetfilter_cttimeout-1.0.0.tar.bz2_MD5 = 7697437fc9ebb6f6b83df56a633db7f9 install : $(TARGET) @@ -83,10 +71,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-* - + @rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7* @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) -# cp -rf /usr/src/linux/include/linux/netfilter /usr/include/linux # Layer7 cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz @@ -96,44 +82,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # imq cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.12-IMQ-test4.diff - cd $(DIR_APP) && ./configure --prefix=/usr --with-ksource=/usr/src/linux \ - --libdir=/lib --includedir=/usr/include --enable-libipq \ - --libexecdir=/lib --bindir=/sbin \ - --sbindir=/sbin --mandir=/usr/share/man \ - --with-pkgconfigdir=/usr/lib/pkgconfig + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --with-ksource=/usr/src/linux \ + --libdir=/lib \ + --includedir=/usr/include \ + --enable-libipq \ + --libexecdir=/lib \ + --bindir=/sbin \ + --sbindir=/sbin \ + --mandir=/usr/share/man \ + --with-pkgconfigdir=/usr/lib/pkgconfig + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - # Iptables doesn't install all headers -# mkdir -p /usr/include/net/netfilter -# cp -f $(DIR_APP)/include/net/netfilter/*.h /usr/include/net/netfilter/ -# mkdir -p /usr/include/iptables -# cp -f $(DIR_APP)/include/iptables/*.h /usr/include/iptables/ -# cp -f $(DIR_APP)/include/iptables.h /usr/include/ -# mkdir -p /usr/include/libipulog -# cp -f $(DIR_APP)/include/libipulog/*.h /usr/include/libipulog/ -# mkdir -p /usr/include/libiptc -# cp -f $(DIR_APP)/include/libiptc/*.h /usr/include/libiptc/ - - cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-1.0.0.tar.bz2 - cd $(DIR_SRC)/libnfnetlink-1.0.0 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnfnetlink-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/libnfnetlink-1.0.0 && make install - - cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-1.0.1.tar.bz2 - cd $(DIR_SRC)/libnetfilter_queue-1.0.1 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnetfilter_queue-1.0.1 && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/libnetfilter_queue-1.0.1 && make install - - cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_conntrack-1.0.2.tar.bz2 - cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && make install - - cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_cttimeout-1.0.0.tar.bz2 - cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make install - - @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-* + @rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7* @$(POSTBUILD) diff --git a/lfs/keepalived b/lfs/keepalived index 28b7ed8..2054a54 100644 --- a/lfs/keepalived +++ b/lfs/keepalived @@ -24,7 +24,7 @@ include Config -VER = 1.2.7 +VER = 1.2.17 THISAPP = keepalived-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = keepalived -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8551a34ee048895dbe5350a031ff29c1 +$(DL_FILE)_MD5 = 8d6400e1be43fc303175164d69125dce install : $(TARGET) diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack new file mode 100644 index 0000000..3a0dc1f --- /dev/null +++ b/lfs/libnetfilter_conntrack @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.4 + +THISAPP = libnetfilter_conntrack-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 18cf80c4b339a3285e78822dbd4f08d7 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnetfilter_cthelper b/lfs/libnetfilter_cthelper new file mode 100644 index 0000000..3b469e6 --- /dev/null +++ b/lfs/libnetfilter_cthelper @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.0 + +THISAPP = libnetfilter_cthelper-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b2efab1a3a198a5add448960ba011acd + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnetfilter_cttimeout b/lfs/libnetfilter_cttimeout new file mode 100644 index 0000000..a2184b2 --- /dev/null +++ b/lfs/libnetfilter_cttimeout @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.0 + +THISAPP = libnetfilter_cttimeout-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 7697437fc9ebb6f6b83df56a633db7f9 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnetfilter_queue b/lfs/libnetfilter_queue new file mode 100644 index 0000000..19fe6a2 --- /dev/null +++ b/lfs/libnetfilter_queue @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.2 + +THISAPP = libnetfilter_queue-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = df09befac35cb215865b39a36c96a3fa + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink new file mode 100644 index 0000000..62350ea --- /dev/null +++ b/lfs/libnfnetlink @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.1 + +THISAPP = libnfnetlink-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 98927583d2016a9fb1936fed992e2c5e + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index d3c23c6..9487883 100755 --- a/make.sh +++ b/make.sh @@ -405,6 +405,11 @@ buildipfire() { ipfiremake freetype ipfiremake grub ipfiremake libmnl + ipfiremake libnfnetlink + ipfiremake libnetfilter_queue + ipfiremake libnetfilter_conntrack + ipfiremake libnetfilter_cthelper + ipfiremake libnetfilter_cttimeout ipfiremake iptables case "${TARGET_ARCH}" in hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 56f487169c8b37e78c02bbcea3e79b44ebf3b053
by git＠ipfire.org 21 Jun '15

21 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 56f487169c8b37e78c02bbcea3e79b44ebf3b053 (commit) via 99c36f76587ce52cb4012dc33a4b4fc1c73592a4 (commit) from 321e32316b64ae276abca02d51a822a296645bc1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 56f487169c8b37e78c02bbcea3e79b44ebf3b053 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jun 21 22:23:52 2015 +0200 systemd: Reexec systemd after update. Reexec the systemd init daemon after update from now. This will prevent from leaving the system in an undefined / unuseable status. Fixes #10820. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 99c36f76587ce52cb4012dc33a4b4fc1c73592a4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 21 22:25:19 2015 +0200 Remove Christian Schmidt as package maintainer from various packages No rebuild required Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: c_icap/c_icap.nm | 1 - c_icap_modules/c_icap_modules.nm | 1 - iperf/iperf.nm | 2 -- squid/squid.nm | 1 - systemd/systemd.nm | 5 ++++- 5 files changed, 4 insertions(+), 6 deletions(-) Difference in files: diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm index 9ce56c8..447941e 100644 --- a/c_icap/c_icap.nm +++ b/c_icap/c_icap.nm @@ -7,7 +7,6 @@ name = c_icap version = 0.1.7 release = 4 -maintainer = Christian Schmidt <christian.schmidt(a)ipfire.org> groups = Networking/Daemons url = http://c-icap.sourceforge.net license = GPLv2 diff --git a/c_icap_modules/c_icap_modules.nm b/c_icap_modules/c_icap_modules.nm index e0fe5f2..59e6422 100644 --- a/c_icap_modules/c_icap_modules.nm +++ b/c_icap_modules/c_icap_modules.nm @@ -7,7 +7,6 @@ name = c_icap_modules version = 0.1.6 release = 3 -maintainer = Christian Schmidt <christian.schmidt(a)ipfire.org> groups = Networking/Daemons url = http://c-icap.sourceforge.net license = GPLv2 diff --git a/iperf/iperf.nm b/iperf/iperf.nm index d7612c5..0fa375b 100644 --- a/iperf/iperf.nm +++ b/iperf/iperf.nm @@ -7,7 +7,6 @@ name = iperf version = 2.0.5 release = 1 -maintainer = Christian Schmidt <christian.schmidt(a)ipfire.org> groups = Applications/Internet url = http://www..sourceforge.net/projects/iperf/files/ license = GPLv3+ and LGPLv3+ @@ -29,7 +28,6 @@ end packages package %{name} - end package %{name}-debuginfo template DEBUGINFO diff --git a/squid/squid.nm b/squid/squid.nm index 52821cf..9db9705 100644 --- a/squid/squid.nm +++ b/squid/squid.nm @@ -8,7 +8,6 @@ major_ver = 3.1 version = %{major_ver}.19 release = 2 -maintainer = Christian Schmidt <christian.schmidt(a)ipfire.org> groups = Networking/Daemons url = http://www.squid-cache.org/ license = GPLv2+ diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 3ed1b5b..747983c 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 215 -release = 1 +release = 2 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -226,6 +226,9 @@ packages end script postup + # Re-exec systemd after update. + /usr/bin/systemctl daemon-reexec + # Restart login service after update /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : /usr/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || : hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 321e32316b64ae276abca02d51a822a296645bc1
by git＠ipfire.org 21 Jun '15

21 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 321e32316b64ae276abca02d51a822a296645bc1 (commit) via 05f64a9f8ea9959e5d947f0eca48461f73bc22d3 (commit) via 50d2d07eb84776bfc37ef4f20ad39ca78ee7e018 (commit) via 9b93424f5834b7581914b305dd030ef9f9f2a805 (commit) via 2511f7bf214861e19e6e299a834718fbdd6665b4 (commit) via 7ba4b2a03d9aba7a8e435573d020af9201197e8c (commit) from abf738371c25cfcf754e7d30e8f645ce8377ba7b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 321e32316b64ae276abca02d51a822a296645bc1 Merge: 05f64a9 7ba4b2a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 21 17:16:09 2015 +0200 Merge remote-tracking branch 'stevee/compat-xz' commit 05f64a9f8ea9959e5d947f0eca48461f73bc22d3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 21 17:14:34 2015 +0200 python3: Update to version 3.4.3 This is a major version bump and will probably render some python3-* packages incompatible. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 50d2d07eb84776bfc37ef4f20ad39ca78ee7e018 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 21 17:00:41 2015 +0200 perl: Rebuild against libdb Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9b93424f5834b7581914b305dd030ef9f9f2a805 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 21 16:50:42 2015 +0200 compat-libgcrypt: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2511f7bf214861e19e6e299a834718fbdd6665b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 21 15:47:13 2015 +0200 pyfire: Drop package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7ba4b2a03d9aba7a8e435573d020af9201197e8c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Apr 7 21:41:23 2015 +0200 xz: Move compat libraries into own package. Fixes #10751. ----------------------------------------------------------------------- Summary of changes: .../compat-libgcrypt.nm | 32 +- compat-xz/compat-xz.nm | 62 ++ perl/perl.nm | 4 +- pyfire/pyfire.nm | 42 -- pyfire/src/Makefile | 32 - pyfire/src/__init__.py | 64 -- pyfire/src/config.py | 92 --- pyfire/src/executil.py | 255 -------- pyfire/src/hal.py | 70 --- pyfire/src/net.py | 175 ------ pyfire/src/web.py | 221 ------- python3/patches/00003-remove-mimeaudio-tests.patch | 51 -- python3/patches/00111-no-static-lib.patch | 59 -- .../patches/00113-more-configuration-flags.patch | 50 -- .../patches/00114-statvfs-f_flag-constants.patch | 39 -- .../patches/00125-less-verbose-COUNT_ALLOCS.patch | 20 - .../patches/00131-disable-tests-in-test_io.patch | 11 - .../00132-add-rpmbuild-hooks-to-unittest.patch | 68 -- ...0134-fix-COUNT_ALLOCS-failure-in-test_sys.patch | 21 - ...x-test-within-test_weakref-in-debug-build.patch | 17 - ...kip-distutils-tests-that-fail-in-rpmbuild.patch | 12 - ...0139-skip-test_float-known-failure-on-arm.patch | 11 - .../00141-fix-test_gc_with_COUNT_ALLOCS.patch | 22 - .../00142-skip-failing-pty-tests-in-rpmbuild.patch | 22 - python3/patches/00153-fix-test_gdb-noise.patch | 37 -- python3/patches/00155-avoid-ctypes-thunks.patch | 15 - python3/patches/00156-gdb-autoload-safepath.patch | 52 -- python3/patches/00157-uid-gid-overflows.patch | 696 --------------------- .../00160-disable-test_fs_holes-in-rpm-build.patch | 11 - ...disable-parts-of-test_socket-in-rpm-build.patch | 11 - ...64-disable-interrupted_write-tests-on-ppc.patch | 52 -- python3/patches/05000-autotool-intermediates.patch | 73 --- ...test-subprocess-with-nonreadable-path-dir.patch | 12 - ....3.0b1-lib64.patch => python-3.4.3-lib64.patch} | 84 ++- python3/python3.nm | 33 +- xz/xz.nm | 39 +- 36 files changed, 157 insertions(+), 2410 deletions(-) copy libgcrypt/libgcrypt.nm => compat-libgcrypt/compat-libgcrypt.nm (62%) create mode 100644 compat-xz/compat-xz.nm delete mode 100644 pyfire/pyfire.nm delete mode 100644 pyfire/src/Makefile delete mode 100644 pyfire/src/__init__.py delete mode 100644 pyfire/src/config.py delete mode 100644 pyfire/src/executil.py delete mode 100644 pyfire/src/hal.py delete mode 100644 pyfire/src/net.py delete mode 100644 pyfire/src/web.py delete mode 100644 python3/patches/00003-remove-mimeaudio-tests.patch delete mode 100644 python3/patches/00111-no-static-lib.patch delete mode 100644 python3/patches/00113-more-configuration-flags.patch delete mode 100644 python3/patches/00114-statvfs-f_flag-constants.patch delete mode 100644 python3/patches/00125-less-verbose-COUNT_ALLOCS.patch delete mode 100644 python3/patches/00131-disable-tests-in-test_io.patch delete mode 100644 python3/patches/00132-add-rpmbuild-hooks-to-unittest.patch delete mode 100644 python3/patches/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch delete mode 100644 python3/patches/00135-fix-test-within-test_weakref-in-debug-build.patch delete mode 100644 python3/patches/00137-skip-distutils-tests-that-fail-in-rpmbuild.patch delete mode 100644 python3/patches/00139-skip-test_float-known-failure-on-arm.patch delete mode 100644 python3/patches/00141-fix-test_gc_with_COUNT_ALLOCS.patch delete mode 100644 python3/patches/00142-skip-failing-pty-tests-in-rpmbuild.patch delete mode 100644 python3/patches/00153-fix-test_gdb-noise.patch delete mode 100644 python3/patches/00155-avoid-ctypes-thunks.patch delete mode 100644 python3/patches/00156-gdb-autoload-safepath.patch delete mode 100644 python3/patches/00157-uid-gid-overflows.patch delete mode 100644 python3/patches/00160-disable-test_fs_holes-in-rpm-build.patch delete mode 100644 python3/patches/00163-disable-parts-of-test_socket-in-rpm-build.patch delete mode 100644 python3/patches/00164-disable-interrupted_write-tests-on-ppc.patch delete mode 100644 python3/patches/05000-autotool-intermediates.patch delete mode 100644 python3/patches/python-3.2.1-fix-test-subprocess-with-nonreadable-path-dir.patch rename python3/{python-3.3.0b1-lib64.patch => python-3.4.3-lib64.patch} (69%) Difference in files: diff --git a/compat-libgcrypt/compat-libgcrypt.nm b/compat-libgcrypt/compat-libgcrypt.nm new file mode 100644 index 0000000..32a4374 --- /dev/null +++ b/compat-libgcrypt/compat-libgcrypt.nm @@ -0,0 +1,60 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = compat-libgcrypt +version = 1.5.4 +release = 1 +thisapp = libgcrypt-%{version} + +groups = System/Libraries +url = http://www.gnupg.org/ +license = LGPLv2.1+ +summary = A general-purpose cryptography library + +description + Libgcrypt is a general purpose crypto library based on the code used + in GNU Privacy Guard. +end + +source_dl = ftp://ftp.gnupg.org/gcrypt/libgcrypt/ +sources = %{thisapp}.tar.bz2 + +build + requires + gcc-c++ + libgpg-error-devel + end + + configure_options += \ + --enable-noexecstack + + test + make check + end + + install + # Install just the library and no headers. + mkdir -pv %{BUILDROOT}%{libdir} + + install -m 755 src/.libs/libgcrypt.so.11.8.3 %{BUILDROOT}%{libdir} + ln -svf libgcrypt.so.11.8.3 %{BUILDROOT}%{libdir}/libgcrypt.so.11 + end +end + +packages + package %{name} + provides + libgcrypt = %{thisver} + end + + obsoletes + libgcrypt <= %{thisver} + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/compat-xz/compat-xz.nm b/compat-xz/compat-xz.nm new file mode 100644 index 0000000..9acf280 --- /dev/null +++ b/compat-xz/compat-xz.nm @@ -0,0 +1,62 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = compat-xz +version = 4.999.9beta +release = 1 + +thisapp = xz-%{version} + +groups = Applications/Compression +url = http://tukaani.org/xz/ +license = LGPLv2+ +summary = LZMA Utils. + +description + LZMA provides very high compression ratio and fast decompression. The + core of the LZMA utils is Igor Pavlov's LZMA SDK containing the actual + LZMA encoder/decoder. LZMA utils add a few scripts which provide + gzip-like command line interface and a couple of other LZMA related + tools. +end + +source_dl = http://tukaani.org/xz/ +sources = %{thisapp}.tar.xz + +build + configure_options += \ + --disable-rpath + + test + export LD_LIBRARY_PATH=$(pwd)/src/liblzma/.libs + make check + end + + install + # Only install libraries. + mkdir -pv %{BUILDROOT}%{libdir} + cp -vr src/liblzma/.libs/liblzma.so.0* %{BUILDROOT}%{libdir} + end +end + +packages + package %{name} + provides + xz = %{thisver} + end + + obsoletes + xz-compat + end + + conflicts + xz <= %{thisver} + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/perl/perl.nm b/perl/perl.nm index c31463e..3a611eb 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -6,7 +6,7 @@ name = perl version = 5.20.2 # Never reset release in this package, just increase. -release = 13.2 +release = 13.3 perl_epoch = 2 thisver = %{perl_epoch}:%{version}-%{_release} @@ -33,10 +33,10 @@ source_dl = http://www.cpan.org/src/5.0/ build requires - db4-devel gcc-c++ gdbm-devel iana-etc + libdb-devel perl procps zlib-devel diff --git a/pyfire/pyfire.nm b/pyfire/pyfire.nm deleted file mode 100644 index 7aab8b6..0000000 --- a/pyfire/pyfire.nm +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = pyfire -version = 0.99.1 -release = 1 - -groups = System/Libraries -url = http://www.ipfire.org -license = GPLv3+ -summary = A python library for easy functions. - -description - Pyfire is a library which offers a lot of easy to use functions. -end - -build - requires - python - end - - DIR_APP = %{DIR_SOURCE}/src - - prepare = # Nothing to do - - build = # Nothing to do - - install - make install DESTDIR=%{BUILDROOT} - make clean - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/pyfire/src/Makefile b/pyfire/src/Makefile deleted file mode 100644 index cb8674c..0000000 --- a/pyfire/src/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -NAME = pyfire - -PYTHONLIBDIR = $(DESTDIR)/usr/lib/python2.6/site-packages/$(NAME) - -all: - -install: all - -mkdir -p $(PYTHONLIBDIR) - cp -avf *.py $(PYTHONLIBDIR) - -clean: - rm -f *.o *.so *.pyc *.pyo diff --git a/pyfire/src/__init__.py b/pyfire/src/__init__.py deleted file mode 100644 index 4bd81a6..0000000 --- a/pyfire/src/__init__.py +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -__all__ = [ "config", "executil", "hal", "net", "translate", "web", ] - -import os - -import hal - -class System: - def __init__(self): - self.dbus = hal.get_device("/org/freedesktop/Hal/devices/computer") - - def getKernelVersion(self): - ret = None - try: - ret = self.dbus["system.kernel.version"] - except KeyError: - pass - return ret - - def getFormfactor(self): - return self.dbus["system.formfactor"] - - def getVendor(self): - ret = None - try: - ret = self.dbus["system.vendor"] - except KeyError: - pass - return ret - - def getProduct(self): - ret = None - try: - ret = self.dbus["system.product"] - except KeyError: - pass - return ret - - -if __name__ == "__main__": - system = System() - print "Kernel Version : %s" % system.getKernelVersion() - print "System Formfactor : %s" % system.getFormfactor() - print "System Vendor : %s" % system.getVendor() - print "System Product : %s" % system.getProduct() diff --git a/pyfire/src/config.py b/pyfire/src/config.py deleted file mode 100644 index c77ef44..0000000 --- a/pyfire/src/config.py +++ /dev/null @@ -1,92 +0,0 @@ -# -# simpleconifg.py - representation of a simple configuration file (sh-like) -# -# Matt Wilson <msw(a)redhat.com> -# Jeremy Katz <katzj(a)redhat.com> -# -# Copyright 1999-2002 Red Hat, Inc. -# -# This software may be freely redistributed under the terms of the GNU -# library public license. -# -# You should have received a copy of the GNU Library Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -import string -import os - -# use our own ASCII only uppercase function to avoid locale issues -# not going to be fast but not important -def uppercase_ASCII_string(str): - newstr = "" - for i in range(0,len(str)): - if str[i] in string.lowercase: - newstr += chr(ord(str[i])-32) - else: - newstr += str[i] - - return newstr - -class ConfigFile: - def __str__ (self): - s = "" - keys = self.info.keys () - keys.sort () - for key in keys: - # FIXME - use proper escaping - if type(self.info[key]) == type(""): - s = s + key + "=\"" + self.info[key] + "\"\n" - return s - - def __init__ (self, filename): - self.info = {} - self.filename = filename - self.read() - - def write(self, filename=None): - if not filename: - filename = self.filename - f = open(filename, "w") - f.write(self.__str__()) - f.close() - - def read(self, filename=None): - if not filename: - filename = self.filename - if not os.access(filename, os.R_OK): - return - - f = open(filename, "r") - lines = f.readlines() - f.close() - - for line in lines: - fields = line[:-1].split('=', 2) - if len(fields) < 2: - # how am I supposed to know what to do here? - continue - key = uppercase_ASCII_string(fields[0]) - value = fields[1] - # XXX hack - value = value.replace('"', '') - value = value.replace("'", '') - self.info[key] = value - - def set(self, *args): - for (key, data) in args: - self.info[uppercase_ASCII_string(key)] = data - - def unset(self, *keys): - for key in keys: - key = uppercase_ASCII_string(key) - if self.info.has_key (key): - del self.info[key] - - def get(self, key): - key = uppercase_ASCII_string(key) - if self.info.has_key (key): - return self.info[key] - else: - return "" diff --git a/pyfire/src/executil.py b/pyfire/src/executil.py deleted file mode 100644 index df0eb64..0000000 --- a/pyfire/src/executil.py +++ /dev/null @@ -1,255 +0,0 @@ -# -# executil.py - generic utility functions for executing programs -# -# Erik Troan <ewt(a)redhat.com> -# -# Copyright 1999-2002 Red Hat, Inc. -# -# This software may be freely redistributed under the terms of the GNU -# library public license. -# -# You should have received a copy of the GNU Library Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -import os -import sys -import types -import select -import signal - -def getfd(filespec, readOnly = 0): - if type(filespec) == types.IntType: - return filespec - if filespec == None: - filespec = "/dev/null" - - flags = os.O_RDWR | os.O_CREAT - if (readOnly): - flags = os.O_RDONLY - return os.open(filespec, flags) - -def execWithRedirect(command, argv, stdin = 0, stdout = 1, stderr = 2, - searchPath = 0, root = '/', newPgrp = 0, ignoreTermSigs = 0): - stdin = getfd(stdin) - if stdout == stderr: - stdout = getfd(stdout) - stderr = stdout - else: - stdout = getfd(stdout) - stderr = getfd(stderr) - - childpid = os.fork() - if (not childpid): - if (root and root != '/'): - os.chroot(root) - os.chdir("/") - - if ignoreTermSigs: - signal.signal(signal.SIGTSTP, signal.SIG_IGN) - signal.signal(signal.SIGINT, signal.SIG_IGN) - - if type(stdin) == type("a"): - stdin = os.open(stdin, os.O_RDONLY) - if type(stdout) == type("a"): - stdout = os.open(stdout, os.O_RDWR) - if type(stderr) == type("a"): - stderr = os.open(stderr, os.O_RDWR) - - if stdin != 0: - os.dup2(stdin, 0) - os.close(stdin) - if stdout != 1: - os.dup2(stdout, 1) - if stdout != stderr: - os.close(stdout) - if stderr != 2: - os.dup2(stderr, 2) - os.close(stderr) - - if (searchPath): - os.execvp(command, argv) - else: - os.execv(command, argv) - - sys.exit(1) - - if newPgrp: - os.setpgid(childpid, childpid) - oldPgrp = os.tcgetpgrp(0) - os.tcsetpgrp(0, childpid) - - status = -1 - try: - (pid, status) = os.waitpid(childpid, 0) - except OSError, (errno, msg): - print __name__, "waitpid:", msg - - if newPgrp: - os.tcsetpgrp(0, oldPgrp) - - return status - -## Run an external program and capture standard out. -# @param command The command to run. -# @param argv A list of arguments. -# @param stdin The file descriptor to read stdin from. -# @param stderr The file descriptor to redirect stderr to. -# @param root The directory to chroot to before running command. -# @return The output of command from stdout. -def execWithCapture(command, argv, stdin = 0, stderr = 2, root='/'): - def chroot(): - os.chroot(root) - - argv = list(argv) - if type(stdin) == type("string"): - if os.access(stdin, os.R_OK): - stdin = open(stdin) - else: - stdin = 0 - if type(stderr) == type("string"): - stderr = open(stderr, "w") - - try: - pipe = subprocess.Popen([command] + argv, stdin=stdin, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - preexec_fn=chroot, cwd=root) - except OSError, (errno, msg): - log.error ("Error running " + command + ": " + msg) - raise RuntimeError, "Error running " + command + ": " + msg - - rc = pipe.stdout.read() - pipe.wait() - return rc - -def execWithCaptureStatus(command, argv, searchPath = 0, root = '/', stdin = 0, - catchfd = 1, closefd = -1): - - if not os.access (root + command, os.X_OK): - raise RuntimeError, command + " can not be run" - - (read, write) = os.pipe() - - childpid = os.fork() - if (not childpid): - if (root and root != '/'): os.chroot (root) - if isinstance(catchfd, tuple): - for fd in catchfd: - os.dup2(write, fd) - else: - os.dup2(write, catchfd) - os.close(write) - os.close(read) - - if closefd != -1: - os.close(closefd) - - if stdin: - os.dup2(stdin, 0) - os.close(stdin) - - if (searchPath): - os.execvp(command, argv) - else: - os.execv(command, argv) - - sys.exit(1) - - os.close(write) - - rc = "" - s = "1" - while (s): - select.select([read], [], []) - s = os.read(read, 1000) - rc = rc + s - - os.close(read) - - status = None - - try: - (pid, status) = os.waitpid(childpid, 0) - except OSError, (errno, msg): - print __name__, "waitpid:", msg - - if os.WIFEXITED(status) and (os.WEXITSTATUS(status) == 0): - status = os.WEXITSTATUS(status) - else: - status = -1 - - return (rc, status) - -def execWithCaptureErrorStatus(command, argv, searchPath = 0, root = '/', - stdin = 0, catchfd = 1, catcherrfd = 2, closefd = -1): - - if not os.access (root + command, os.X_OK): - raise RuntimeError, command + " can not be run" - - (read, write) = os.pipe() - (read_err,write_err) = os.pipe() - - childpid = os.fork() - if (not childpid): - if (root and root != '/'): os.chroot (root) - if isinstance(catchfd, tuple): - for fd in catchfd: - os.dup2(write, fd) - else: - os.dup2(write, catchfd) - os.close(write) - os.close(read) - - if isinstance(catcherrfd, tuple): - for fd in catcherrfd: - os.dup2(write_err, fd) - else: - os.dup2(write_err, catcherrfd) - os.close(write_err) - os.close(read_err) - - if closefd != -1: - os.close(closefd) - - if stdin: - os.dup2(stdin, 0) - os.close(stdin) - - if (searchPath): - os.execvp(command, argv) - else: - os.execv(command, argv) - - sys.exit(1) - - os.close(write) - os.close(write_err) - - rc = "" - rc_err = "" - s = "1" - t = "1" - while (s or t): - select.select([read], [], []) - s = os.read(read, 1000) - t = os.read(read_err, 1000) - rc = rc + s - rc_err = rc_err + t - - os.close(read) - os.close(read_err) - - status = None - - try: - (pid, status) = os.waitpid(childpid, 0) - except OSError, (errno, msg): - print __name__, "waitpid:", msg - - if os.WIFEXITED(status) and (os.WEXITSTATUS(status) == 0): - status = os.WEXITSTATUS(status) - else: - status = -1 - - return (rc, rc_err, status) diff --git a/pyfire/src/hal.py b/pyfire/src/hal.py deleted file mode 100644 index 6d4e6de..0000000 --- a/pyfire/src/hal.py +++ /dev/null @@ -1,70 +0,0 @@ -# -# minihal.py: Simple wrapper around HAL -# -# Copyright (C) 2007 Red Hat, Inc. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Author(s): Bill Nottingham <notting(a)redhat.com> -# - -"""Simple wrapper around HAL""" - -import dbus - -def get_device(udi): - """Retrieve all properties of a particular device (by UDI)""" - try: - bus = dbus.SystemBus() - haldev = dbus.Interface(bus.get_object("org.freedesktop.Hal", udi), "org.freedesktop.Hal.Device") - props = haldev.GetAllProperties() - except dbus.exceptions.DBusException: - return None - - if props.has_key('block.device'): - props['device'] = props['block.device'].encode("utf-8") - elif props.has_key('linux.device_file'): - props['device'] = props['linux.device_file'].encode("utf-8") - elif props.has_key('net.interface'): - props['device'] = props['net.interface'].encode("utf-8") - else: - props['device'] = None - - props['description'] = '' - if props.has_key('info.product'): - if props.has_key('info.vendor'): - props['description'] = '%s %s' % (props['info.vendor'],props['info.product']) - else: - props['description'] = props['info.product'] - else: - props['description'] = props['info.udi'] - if props.has_key('net.originating_device'): - pdev = get_device(props['net.originating_device']) - props['description'] = pdev['description'] - - return props - -def get_devices_by_type(type): - """Retrieve all devices of a particular type""" - ret = [] - try: - bus = dbus.SystemBus() - hal = dbus.Interface(bus.get_object("org.freedesktop.Hal","/org/freedesktop/Hal/Manager"),"org.freedesktop.Hal.Manager") - except: - return ret - for udi in hal.FindDeviceByCapability(type): - dev = get_device(udi) - if dev: - ret.append(dev) - return ret diff --git a/pyfire/src/net.py b/pyfire/src/net.py deleted file mode 100644 index 94a262a..0000000 --- a/pyfire/src/net.py +++ /dev/null @@ -1,175 +0,0 @@ -#!/usr/bin/python -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -import os -import os.path -import socket -import string - -import hal -from config import ConfigFile - -NETWORK_DEVICES="/etc/sysconfig/network-devices/" -NETWORK_SETTINGS="/etc/sysconfig/network" -NETWORK_SCRIPTS="/etc/init.d/networking/" - -class Network: - def __init__(self): - self.bridges = {} - self.nics = {} - - self.settings = NetworkSettings(NETWORK_SETTINGS) - - def getNics(self): - for device in hal.get_devices_by_type("net"): - if device.has_key('net.arp_proto_hw_id'): - if device['net.arp_proto_hw_id'] == 1 and \ - not device['info.category'] == 'net.bridge': - nic = device['device'] - self.nics[nic] = NetworkDevice(nic, device) - return self.nics - - def getNic(self, nic): - return self.nics[nic] - - def getBridges(self, colour=None): - for file in os.listdir(NETWORK_DEVICES): - bridge = os.path.basename(file) - if colour and not bridge.startswith(colour): - continue - self.bridges[bridge] = BrideDevice(bridge) - return self.bridges - - def getBridge(self, bridge): - return self.bridges[bridge] - - def addBridge(self, dev): - self.bridges[dev] = BridgeDevice(dev) - - def delBridge(self, dev): - self.bridges[dev].remove() - del self.bridges[dev] - - def write(self): - for bridge in self.bridges.items(): - self.bridges[bridge].write() - self.settings.write() - - -class NetworkSettings(ConfigFile): - def __init__(self, filename): - ConfigFile.__init__(self, filename) - - def getHostname(self): - return self.get("HOSTNAME") - - def setHostname(self, hostname): - self.set(("HOSTNAME", hostname)) - - -class BridgeDevice: - def __init__(self, dev): - self.filename = "%s/%s/" % (NETWORK_DEVICES, dev,) - self.device = dev - self.services = [] - - for file in os.listdir(self.filename): - service = Service(file, bridge=self.device) - self.addService(service) - - def addService(self, service): - self.services.append(service) - - def getPolicy(self, service): - ret = [] - for service in self.services: - if service.service == service: - ret.append(service) - return ret - - def delService(self, service): - pass # how to do this? - - def addNic(self, nic): - # requires a NetworkDevice instance - filename = os.path.join(self.filename, nic.getDevice()) - service = Service(filename, bridge=self.name, service="bridge-slave") - service.set(("DESCRIPTION", nic.getDescription()), - ("MAC", nic.getMac())) - self.addService(service) - - def write(self): - if not os.path.isdir(fn): - os.makedirs(fn) - - # Save all service information - for service in self.services: - service.write() - - -class NetworkDevice: - def __init__(self, dev, dbus): - self.device = dev - self.dbus = dbus - - def __str__(self): - return "%s (%s) - %s" % (self.device, self.getDescription(), self.getMac()) - - def getDevice(self): - return self.device - - def getMac(self): - return self.dbus["net.address"] - - def getDescription(self): - return self.dbus["description"] - - -class ServiceError(Exception): - pass - - -class Service(ConfigFile): - def __init__(self, filename, bridge=None, service=None): - self.service = None - if service: - self.setService(service) - ConfigFile.__init__(self, filename) - self.bridge = bridge - self.name = os.path.basename(self.filename) - - def setService(self, service): - if not service in listAllServices(): - raise ServiceError, "The given service is not available: %s" % service - self.service = service - - -def listAllServices(): - ret = [] - for service in os.listdir(NETWORK_SCRIPTS + "services/"): - ret.append(service) - return ret - -if __name__ == "__main__": - network = Network() - print "All available nics on this system:" - for nic, obj in network.getNics().items(): - print obj diff --git a/pyfire/src/web.py b/pyfire/src/web.py deleted file mode 100644 index b6f2172..0000000 --- a/pyfire/src/web.py +++ /dev/null @@ -1,221 +0,0 @@ -#!/usr/bin/python -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -import os -import cgi - -import pyfire.net as net - -addPoPath("/srv/www/ipfire/cgi-bin/po/") -textdomain("ipfire") - -### Variables -allowed_endings = [ "cgi", "py",] - -class IPFireWeb: - def __init__(self, title, icon): - self.title = title - self.icon = icon - self.hostname = net.gethostname() - - ### This is a hash with all of the important vars: - ## - "title" - The title of the current page - ## - "icon" - The displayed icon - ## - "hostname" - The local hostname - self.info = { "title": self.title, - "icon": self.icon, - "hostname": self.hostname, - } - - ### This is the menu tree - ## Every index has got a hash with a few arguments: - ## - "title" which is the title of the section - ## - "subs" is a tuple with all the submenu items - ## One submenu items looks like this: - ## (_("Home"), "index.py") - ## name of the item ^^^^ ^^^^^^^^ filename - self.menu = {} - - for section in os.listdir("/etc/ipfire/menu"): - f = open("/etc/ipfire/menu/" + section) - self.menu[section] = { "title" : "", "subs" : [],} - for line in f.readlines(): - (item, filename) = line.rstrip("\n").split(":",1) - if item == "title": - self.menu[section]["title"] = _(filename) - else: - self.menu[section]["subs"].append((_(item), filename)) - f.close() - - def __run__(self): - ### This initializes the http(s) response - self.showhttpheaders() - self.getcgihash() - - ### Page - self.openpage() - self.content() - self.closepage() - - def openpage(self): - print """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> - -<head> - <title>%(hostname)s - IPFire v3 - %(title)s</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link rel="shortcut icon" href="/favicon.ico" /> - <link rel="stylesheet" type="text/css" href="include/style.css" /> -</head> -""" % self.info - self.openheader() - self.genbigmenu() - self.closeheader() - self.openbigbox() - - def closepage(self): - self.closebigbox() - self.footer() - - def openheader(self): - print """ - -<body> -  - <div id="header"> - <div id="header_inner" class="fixed"> -  - <div id="logo"> - <img src="/images/icons/%(icon)s" width="48px" height="48px" alt="Symbol" class="symbol" /> - <h1><span>%(hostname)s</span></h1> - <br /> - <h2>%(title)s</h2> - </div>""" % self.info - def closeheader(self): - print """ </div> - </div> - """ - - def openbigbox(self): - print """ -  - <div id="main"> - <div id="main_inner" class="fixed"> - <div id="primaryContent_2columns"> - <div id="columnA_2columns"> - """ - - def openbox(self, title): - print """ - <div class="post"> - <h3>%s</h3>""" % (title,) - - def closebox(self): - print """ - </div> - <br class="clear" />""" - - def closebigbox(self): - print """ -  - </div> - </div>""" - self.genmenu() - - def genbigmenu(self): - print """ -  - <div id="menu"> - <ul>""" - sections = self.menu.keys() - sections.sort() - for section in sections: - filename = self.menu[section]["subs"][0][1] - print "\t\t\t\t\t\t", - print "<li><a href=\"/%s\">%s</a></li>" % \ - (filename, self.menu[section]["title"]) - print """ - </ul> - </div>""" - - def genmenu(self): - this_file = os.path.basename(os.environ["SCRIPT_NAME"]) - this_section = None - - for i in self.menu.keys(): - for j in self.menu[i]["subs"]: - if this_file == os.path.basename(j[1]): - this_section = i - break - if not this_section is None: - break - - if this_section is None: - return - - print """ - <div id="secondaryContent_2columns"> - <div id="columnC_2columns"> - <h4><span>Side</span>menu</h4> - <ul class="links">""" - - for item in self.menu[this_section]["subs"]: - print "\t\t\t\t\t\t\t", - if item[1] == this_file: - print "<li class=\"selected\">", - else: - print "<li>", - print "<a href=\"/cgi-bin/%s\">%s</a></li>" \ - % (item[1], item[0],) - - print """ - </ul> - </div> - </div> - <br class="clear" />""" - - def footer(self): - print """ - <div id="footer" class="fixed"> - <span>Load average: %(load)s - </div>""" % { "load" : os.getloadavg() } - print """ - </div> - </div> -</body> -</html> -""" - - def showhttpheaders(self, type="text/html"): - print "Pragma: no-cache" - print "Cache-control: no-cache" - print "Connection: close" - print "Content-type:" + type - print - # An empty line ends the header - - def getcgihash(self): - self.cgihash = cgi.FieldStorage() - - def content(self): - self.openbox(_("Error")) - print "This site has no content defined, yet. Please define site.content()." - self.closebox() diff --git a/python3/patches/00003-remove-mimeaudio-tests.patch b/python3/patches/00003-remove-mimeaudio-tests.patch deleted file mode 100644 index 8341363..0000000 --- a/python3/patches/00003-remove-mimeaudio-tests.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -up Python-3.3.0rc1/Lib/test/test_email/test_email.py.remove-mimeaudio-tests Python-3.3.0rc1/Lib/test/test_email/test_email.py ---- Python-3.3.0rc1/Lib/test/test_email/test_email.py.remove-mimeaudio-tests 2012-08-25 15:22:10.000000000 -0400 -+++ Python-3.3.0rc1/Lib/test/test_email/test_email.py 2012-08-27 11:00:11.936964586 -0400 -@@ -1321,47 +1321,6 @@ Blah blah blah - self.assertEqual(b.getvalue(), source + b'>From R\xc3\xb6lli\n') - - --# Test the basic MIMEAudio class --class TestMIMEAudio(unittest.TestCase): -- def setUp(self): -- with openfile('audiotest.au', 'rb') as fp: -- self._audiodata = fp.read() -- self._au = MIMEAudio(self._audiodata) -- -- def test_guess_minor_type(self): -- self.assertEqual(self._au.get_content_type(), 'audio/basic') -- -- def test_encoding(self): -- payload = self._au.get_payload() -- self.assertEqual(base64.decodebytes(bytes(payload, 'ascii')), -- self._audiodata) -- -- def test_checkSetMinor(self): -- au = MIMEAudio(self._audiodata, 'fish') -- self.assertEqual(au.get_content_type(), 'audio/fish') -- -- def test_add_header(self): -- eq = self.assertEqual -- unless = self.assertTrue -- self._au.add_header('Content-Disposition', 'attachment', -- filename='audiotest.au') -- eq(self._au['content-disposition'], -- 'attachment; filename="audiotest.au"') -- eq(self._au.get_params(header='content-disposition'), -- [('attachment', ''), ('filename', 'audiotest.au')]) -- eq(self._au.get_param('filename', header='content-disposition'), -- 'audiotest.au') -- missing = [] -- eq(self._au.get_param('attachment', header='content-disposition'), '') -- unless(self._au.get_param('foo', failobj=missing, -- header='content-disposition') is missing) -- # Try some missing stuff -- unless(self._au.get_param('foobar', missing) is missing) -- unless(self._au.get_param('attachment', missing, -- header='foobar') is missing) -- -- -- - # Test the basic MIMEImage class - class TestMIMEImage(unittest.TestCase): - def setUp(self): diff --git a/python3/patches/00111-no-static-lib.patch b/python3/patches/00111-no-static-lib.patch deleted file mode 100644 index 91b24b8..0000000 --- a/python3/patches/00111-no-static-lib.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -up cpython-59223da36dec/Makefile.pre.in.no-static-lib cpython-59223da36dec/Makefile.pre.in ---- cpython-59223da36dec/Makefile.pre.in.no-static-lib 2012-08-07 16:43:43.296466422 -0400 -+++ cpython-59223da36dec/Makefile.pre.in 2012-08-07 16:44:13.299464371 -0400 -@@ -464,7 +464,7 @@ coverage: - - - # Build the interpreter --$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) -+$(BUILDPYTHON): Modules/python.o $(LDLIBRARY) $(PY3LIBRARY) - $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - - platform: $(BUILDPYTHON) $(SYSCONFIGDATA) -@@ -480,18 +480,6 @@ sharedmods: $(BUILDPYTHON) $(SYSCONFIGDA - $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build - --# Build static library --# avoid long command lines, same as LIBRARY_OBJS --$(LIBRARY): $(LIBRARY_OBJS) -- -rm -f $@ -- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o -- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS) -- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) -- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o -- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS) -- $(AR) $(ARFLAGS) $@ $(MODOBJS) -- $(RANLIB) $@ -- - libpython$(LDVERSION).so: $(LIBRARY_OBJS) - if test $(INSTSONAME) != $(LDLIBRARY); then \ - $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ -@@ -581,7 +569,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.d - echo "-----------------------------------------------"; \ - fi - --Modules/_testembed: Modules/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) -+Modules/_testembed: Modules/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) - $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - - ############################################################################ -@@ -1155,18 +1143,6 @@ libainstall: all python-config - else true; \ - fi; \ - done -- @if test -d $(LIBRARY); then :; else \ -- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ -- if test "$(SO)" = .dll; then \ -- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ -- else \ -- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ -- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ -- fi; \ -- else \ -- echo Skip install of $(LIBRARY) - use make frameworkinstall; \ -- fi; \ -- fi - $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c - $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o - $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in diff --git a/python3/patches/00113-more-configuration-flags.patch b/python3/patches/00113-more-configuration-flags.patch deleted file mode 100644 index 1067af1..0000000 --- a/python3/patches/00113-more-configuration-flags.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -up Python-3.3.0b1/configure.ac.more-configuration-flags Python-3.3.0b1/configure.ac ---- Python-3.3.0b1/configure.ac.more-configuration-flags 2012-07-20 13:25:33.232864839 -0400 -+++ Python-3.3.0b1/configure.ac 2012-07-20 13:25:33.314863815 -0400 -@@ -2585,6 +2585,30 @@ else AC_MSG_RESULT(no) - fi], - [AC_MSG_RESULT(no)]) - -+AC_MSG_CHECKING(for --with-count-allocs) -+AC_ARG_WITH(count-allocs, -+[ --with(out)count-allocs enable/disable per-type instance accounting], [ -+if test "$withval" != no -+then -+ AC_DEFINE(COUNT_ALLOCS, 1, -+ [Define to keep records of the number of instances of each type]) -+ AC_MSG_RESULT(yes) -+else AC_MSG_RESULT(no) -+fi], -+[AC_MSG_RESULT(no)]) -+ -+AC_MSG_CHECKING(for --with-call-profile) -+AC_ARG_WITH(call-profile, -+[ --with(out)-call-profile enable/disable statistics on function call invocation], [ -+if test "$withval" != no -+then -+ AC_DEFINE(CALL_PROFILE, 1, -+ [Define to keep records on function call invocation]) -+ AC_MSG_RESULT(yes) -+else AC_MSG_RESULT(no) -+fi], -+[AC_MSG_RESULT(no)]) -+ - # Check for Python-specific malloc support - AC_MSG_CHECKING(for --with-pymalloc) - AC_ARG_WITH(pymalloc, -diff -up Python-3.3.0b1/pyconfig.h.in.more-configuration-flags Python-3.3.0b1/pyconfig.h.in ---- Python-3.3.0b1/pyconfig.h.in.more-configuration-flags 2012-07-20 13:25:33.000000000 -0400 -+++ Python-3.3.0b1/pyconfig.h.in 2012-07-20 13:26:02.826494869 -0400 -@@ -12,6 +12,12 @@ - support for AIX C++ shared extension modules. */ - #undef AIX_GENUINE_CPLUSPLUS - -+/* Define to keep records on function call invocation */ -+#undef CALL_PROFILE -+ -+/* Define to keep records of the number of instances of each type */ -+#undef COUNT_ALLOCS -+ - /* Define if C doubles are 64-bit IEEE 754 binary format, stored in ARM - mixed-endian order (byte order 45670123) */ - #undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 diff --git a/python3/patches/00114-statvfs-f_flag-constants.patch b/python3/patches/00114-statvfs-f_flag-constants.patch deleted file mode 100644 index af0d780..0000000 --- a/python3/patches/00114-statvfs-f_flag-constants.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up Python-3.3.0b1/Modules/posixmodule.c.statvfs-f_flag-constants Python-3.3.0b1/Modules/posixmodule.c ---- Python-3.3.0b1/Modules/posixmodule.c.statvfs-f_flag-constants 2012-06-26 16:19:54.000000000 -0400 -+++ Python-3.3.0b1/Modules/posixmodule.c 2012-07-20 13:39:18.595546387 -0400 -@@ -11665,6 +11665,35 @@ all_ins(PyObject *d) - if (ins(d, "ST_NOSUID", (long)ST_NOSUID)) return -1; - #endif /* ST_NOSUID */ - -+ /* GNU extensions */ -+#ifdef ST_NODEV -+ if (ins(d, "ST_NODEV", (long)ST_NODEV)) return -1; -+#endif /* ST_NODEV */ -+#ifdef ST_NOEXEC -+ if (ins(d, "ST_NOEXEC", (long)ST_NOEXEC)) return -1; -+#endif /* ST_NOEXEC */ -+#ifdef ST_SYNCHRONOUS -+ if (ins(d, "ST_SYNCHRONOUS", (long)ST_SYNCHRONOUS)) return -1; -+#endif /* ST_SYNCHRONOUS */ -+#ifdef ST_MANDLOCK -+ if (ins(d, "ST_MANDLOCK", (long)ST_MANDLOCK)) return -1; -+#endif /* ST_MANDLOCK */ -+#ifdef ST_WRITE -+ if (ins(d, "ST_WRITE", (long)ST_WRITE)) return -1; -+#endif /* ST_WRITE */ -+#ifdef ST_APPEND -+ if (ins(d, "ST_APPEND", (long)ST_APPEND)) return -1; -+#endif /* ST_APPEND */ -+#ifdef ST_NOATIME -+ if (ins(d, "ST_NOATIME", (long)ST_NOATIME)) return -1; -+#endif /* ST_NOATIME */ -+#ifdef ST_NODIRATIME -+ if (ins(d, "ST_NODIRATIME", (long)ST_NODIRATIME)) return -1; -+#endif /* ST_NODIRATIME */ -+#ifdef ST_RELATIME -+ if (ins(d, "ST_RELATIME", (long)ST_RELATIME)) return -1; -+#endif /* ST_RELATIME */ -+ - /* FreeBSD sendfile() constants */ - #ifdef SF_NODISKIO - if (ins(d, "SF_NODISKIO", (long)SF_NODISKIO)) return -1; diff --git a/python3/patches/00125-less-verbose-COUNT_ALLOCS.patch b/python3/patches/00125-less-verbose-COUNT_ALLOCS.patch deleted file mode 100644 index 8cef015..0000000 --- a/python3/patches/00125-less-verbose-COUNT_ALLOCS.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up Python-2.7/Python/pythonrun.c.less-verbose-COUNT_ALLOCS Python-2.7/Python/pythonrun.c ---- Python-2.7/Python/pythonrun.c.less-verbose-COUNT_ALLOCS 2010-08-17 14:49:33.321913909 -0400 -+++ Python-2.7/Python/pythonrun.c 2010-08-17 14:54:48.750910403 -0400 -@@ -470,7 +470,15 @@ Py_Finalize(void) - - /* Debugging stuff */ - #ifdef COUNT_ALLOCS -- dump_counts(stdout); -+ /* This is a downstream Fedora modification. -+ The upstream default with COUNT_ALLOCS is to always dump the counts to -+ stdout on exit. For our debug builds its useful to have the info from -+ COUNT_ALLOCS available, but the stdout info here gets in the way, so -+ we make it optional, wrapping it in an environment variable (modelled -+ on the other PYTHONDUMP* env variables): -+ */ -+ if (Py_GETENV("PYTHONDUMPCOUNTS")) -+ dump_counts(stdout); - #endif - - PRINT_TOTAL_REFS(); diff --git a/python3/patches/00131-disable-tests-in-test_io.patch b/python3/patches/00131-disable-tests-in-test_io.patch deleted file mode 100644 index d81a2d0..0000000 --- a/python3/patches/00131-disable-tests-in-test_io.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up Python-2.7.2/Lib/test/test_io.py.disable-tests-in-test_io Python-2.7.2/Lib/test/test_io.py ---- Python-2.7.2/Lib/test/test_io.py.disable-tests-in-test_io 2011-09-01 14:18:45.963304089 -0400 -+++ Python-2.7.2/Lib/test/test_io.py 2011-09-01 15:08:53.796098413 -0400 -@@ -2669,6 +2669,7 @@ class SignalsTest(unittest.TestCase): - self.check_interrupted_read_retry(lambda x: x, - mode="r") - -+ @unittest.skip('rhbz#732998') - @unittest.skipUnless(threading, 'Threading required for this test.') - def check_interrupted_write_retry(self, item, **fdopen_kwargs): - """Check that a buffered write, when it gets interrupted (either diff --git a/python3/patches/00132-add-rpmbuild-hooks-to-unittest.patch b/python3/patches/00132-add-rpmbuild-hooks-to-unittest.patch deleted file mode 100644 index fdfbab8..0000000 --- a/python3/patches/00132-add-rpmbuild-hooks-to-unittest.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -up Python-3.2.2/Lib/unittest/case.py.add-rpmbuild-hooks-to-unittest Python-3.2.2/Lib/unittest/case.py ---- Python-3.2.2/Lib/unittest/case.py.add-rpmbuild-hooks-to-unittest 2011-09-03 12:16:44.000000000 -0400 -+++ Python-3.2.2/Lib/unittest/case.py 2011-09-09 06:35:16.365568382 -0400 -@@ -3,6 +3,7 @@ - import sys - import functools - import difflib -+import os - import pprint - import re - import warnings -@@ -101,6 +102,43 @@ def expectedFailure(func): - return wrapper - - -+# Non-standard/downstream-only hooks for handling issues with specific test -+# cases: -+ -+def _skipInRpmBuild(reason): -+ """ -+ Non-standard/downstream-only decorator for marking a specific unit test -+ to be skipped when run within the %check of an rpmbuild. -+ -+ Specifically, this takes effect when WITHIN_PYTHON_RPM_BUILD is set within -+ the environment, and has no effect otherwise. -+ """ -+ if 'WITHIN_PYTHON_RPM_BUILD' in os.environ: -+ return skip(reason) -+ else: -+ return _id -+ -+def _expectedFailureInRpmBuild(func): -+ """ -+ Non-standard/downstream-only decorator for marking a specific unit test -+ as expected to fail within the %check of an rpmbuild. -+ -+ Specifically, this takes effect when WITHIN_PYTHON_RPM_BUILD is set within -+ the environment, and has no effect otherwise. -+ """ -+ @functools.wraps(func) -+ def wrapper(*args, **kwargs): -+ if 'WITHIN_PYTHON_RPM_BUILD' in os.environ: -+ try: -+ func(*args, **kwargs) -+ except Exception: -+ raise _ExpectedFailure(sys.exc_info()) -+ raise _UnexpectedSuccess -+ else: -+ # Call directly: -+ func(*args, **kwargs) -+ return wrapper -+ - class _AssertRaisesBaseContext(object): - - def __init__(self, expected, test_case, callable_obj=None, -diff -up Python-3.2.2/Lib/unittest/__init__.py.add-rpmbuild-hooks-to-unittest Python-3.2.2/Lib/unittest/__init__.py ---- Python-3.2.2/Lib/unittest/__init__.py.add-rpmbuild-hooks-to-unittest 2011-09-03 12:16:44.000000000 -0400 -+++ Python-3.2.2/Lib/unittest/__init__.py 2011-09-09 06:35:16.366568382 -0400 -@@ -57,7 +57,8 @@ __unittest = True - - from .result import TestResult - from .case import (TestCase, FunctionTestCase, SkipTest, skip, skipIf, -- skipUnless, expectedFailure) -+ skipUnless, expectedFailure, -+ _skipInRpmBuild, _expectedFailureInRpmBuild) - from .suite import BaseTestSuite, TestSuite - from .loader import (TestLoader, defaultTestLoader, makeSuite, getTestCaseNames, - findTestCases) diff --git a/python3/patches/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch b/python3/patches/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch deleted file mode 100644 index 087705c..0000000 --- a/python3/patches/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up Python-3.3.0b2/Lib/test/test_sys.py.fix-COUNT_ALLOCS-failure-in-test_sys Python-3.3.0b2/Lib/test/test_sys.py ---- Python-3.3.0b2/Lib/test/test_sys.py.fix-COUNT_ALLOCS-failure-in-test_sys 2012-08-11 02:54:16.000000000 -0400 -+++ Python-3.3.0b2/Lib/test/test_sys.py 2012-08-13 14:50:15.253720597 -0400 -@@ -835,12 +835,17 @@ class SizeofTest(unittest.TestCase): - # type - # static type: PyTypeObject - s = vsize('P2n15Pl4Pn9Pn11PI') -+ # COUNT_ALLOCS adds a further 3 Py_ssize_t and 2 pointers: -+ if hasattr(sys, 'getcounts'): -+ s += struct.calcsize('3P2P') - check(int, s) - # (PyTypeObject + PyNumberMethods + PyMappingMethods + - # PySequenceMethods + PyBufferProcs + 4P) - s = vsize('P2n15Pl4Pn9Pn11PI') + struct.calcsize('34P 3P 10P 2P 4P') - # Separate block for PyDictKeysObject with 4 entries - s += struct.calcsize("2nPn") + 4*struct.calcsize("n2P") -+ if hasattr(sys, 'getcounts'): -+ s += struct.calcsize('3P2P') - # class - class newstyleclass(object): pass - check(newstyleclass, s) diff --git a/python3/patches/00135-fix-test-within-test_weakref-in-debug-build.patch b/python3/patches/00135-fix-test-within-test_weakref-in-debug-build.patch deleted file mode 100644 index 6ed7801..0000000 --- a/python3/patches/00135-fix-test-within-test_weakref-in-debug-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up Python-3.2b2/Lib/test/test_weakref.py.test-weakref-COUNT_ALLOCS_fix Python-3.2b2/Lib/test/test_weakref.py ---- Python-3.2b2/Lib/test/test_weakref.py.test-weakref-COUNT_ALLOCS_fix 2010-12-28 20:33:46.963364990 -0500 -+++ Python-3.2b2/Lib/test/test_weakref.py 2010-12-28 20:35:44.115935248 -0500 -@@ -583,9 +583,10 @@ class ReferencesTestCase(TestBase): - # been cleared without their callbacks executing. OTOH, the weakref - # to C is bound to a function local (wr), and wasn't trash, so that - # callback should have been invoked when C went away. -- self.assertEqual(alist, ["C went away"]) -- # The remaining weakref should be dead now (its callback ran). -- self.assertEqual(wr(), None) -+ if not hasattr(sys, 'getcounts'): -+ self.assertEqual(alist, ["C went away"]) -+ # The remaining weakref should be dead now (its callback ran). -+ self.assertEqual(wr(), None) - - del alist[:] - gc.collect() diff --git a/python3/patches/00137-skip-distutils-tests-that-fail-in-rpmbuild.patch b/python3/patches/00137-skip-distutils-tests-that-fail-in-rpmbuild.patch deleted file mode 100644 index 8a6bc46..0000000 --- a/python3/patches/00137-skip-distutils-tests-that-fail-in-rpmbuild.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py.skip-distutils-tests-that-fail-in-rpmbuild Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py ---- Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py.skip-distutils-tests-that-fail-in-rpmbuild 2011-09-03 12:16:40.000000000 -0400 -+++ Python-3.2.2/Lib/distutils/tests/test_bdist_rpm.py 2011-09-10 05:04:56.328852558 -0400 -@@ -23,6 +23,7 @@ setup(name='foo', version='0.1', py_modu - - """ - -+(a)unittest._skipInRpmBuild("don't try to nest one rpm build inside another rpm build") - class BuildRpmTestCase(support.TempdirManager, - support.LoggingSilencer, - unittest.TestCase): -diff -up Python-3.2.2/Lib/distutils/tests/test_build_ext.py.skip-distutils-tests-that-fail-in-rpmbuild Python-3.2.2/Lib/distutils/tests/test_build_ext.py diff --git a/python3/patches/00139-skip-test_float-known-failure-on-arm.patch b/python3/patches/00139-skip-test_float-known-failure-on-arm.patch deleted file mode 100644 index 9d0bfad..0000000 --- a/python3/patches/00139-skip-test_float-known-failure-on-arm.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up Python-2.7.2/Lib/test/test_float.py.skip-test_float-known-failure-on-arm Python-2.7.2/Lib/test/test_float.py ---- Python-2.7.2/Lib/test/test_float.py.skip-test_float-known-failure-on-arm 2011-09-08 19:34:09.000986128 -0400 -+++ Python-2.7.2/Lib/test/test_float.py 2011-09-08 19:34:57.969982779 -0400 -@@ -1072,6 +1072,7 @@ class HexFloatTestCase(unittest.TestCase - self.identical(got, expected) - - -+ @unittest.skip('Known failure on ARM: http://bugs.python.org/issue8265') - def test_from_hex(self): - MIN = self.MIN; - MAX = self.MAX; diff --git a/python3/patches/00141-fix-test_gc_with_COUNT_ALLOCS.patch b/python3/patches/00141-fix-test_gc_with_COUNT_ALLOCS.patch deleted file mode 100644 index 337e39e..0000000 --- a/python3/patches/00141-fix-test_gc_with_COUNT_ALLOCS.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up Python-3.2b2/Lib/test/test_gc.py.fix-test-gc-COUNT_ALLOCS Python-3.2b2/Lib/test/test_gc.py ---- Python-3.2b2/Lib/test/test_gc.py.fix-test-gc-COUNT_ALLOCS 2010-12-28 20:39:40.779059772 -0500 -+++ Python-3.2b2/Lib/test/test_gc.py 2010-12-28 20:41:15.890940017 -0500 -@@ -102,10 +102,16 @@ class GCTests(unittest.TestCase): - del a - self.assertNotEqual(gc.collect(), 0) - del B, C -- self.assertNotEqual(gc.collect(), 0) -+ if hasattr(sys, 'getcounts'): -+ self.assertEqual(gc.collect(), 0) -+ else: -+ self.assertNotEqual(gc.collect(), 0) - A.a = A() - del A -- self.assertNotEqual(gc.collect(), 0) -+ if hasattr(sys, 'getcounts'): -+ self.assertEqual(gc.collect(), 0) -+ else: -+ self.assertNotEqual(gc.collect(), 0) - self.assertEqual(gc.collect(), 0) - - def test_method(self): diff --git a/python3/patches/00142-skip-failing-pty-tests-in-rpmbuild.patch b/python3/patches/00142-skip-failing-pty-tests-in-rpmbuild.patch deleted file mode 100644 index 414ffcd..0000000 --- a/python3/patches/00142-skip-failing-pty-tests-in-rpmbuild.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up Python-2.7.2/Lib/test/test_openpty.py.skip-failing-pty-tests-in-rpmbuild Python-2.7.2/Lib/test/test_openpty.py ---- Python-2.7.2/Lib/test/test_openpty.py.skip-failing-pty-tests-in-rpmbuild 2011-09-09 05:09:28.698920379 -0400 -+++ Python-2.7.2/Lib/test/test_openpty.py 2011-09-09 05:10:54.805914490 -0400 -@@ -8,6 +8,7 @@ if not hasattr(os, "openpty"): - - - class OpenptyTest(unittest.TestCase): -+ @unittest._skipInRpmBuild('sometimes fails in Koji, possibly due to a mock issue (rhbz#714627)') - def test(self): - master, slave = os.openpty() - if not os.isatty(slave): -diff -up Python-2.7.2/Lib/test/test_pty.py.skip-failing-pty-tests-in-rpmbuild Python-2.7.2/Lib/test/test_pty.py ---- Python-2.7.2/Lib/test/test_pty.py.skip-failing-pty-tests-in-rpmbuild 2011-09-09 05:09:36.781919825 -0400 -+++ Python-2.7.2/Lib/test/test_pty.py 2011-09-09 05:11:14.741913127 -0400 -@@ -109,6 +109,7 @@ class PtyTest(unittest.TestCase): - os.close(master_fd) - - -+ @unittest._skipInRpmBuild('sometimes fails in Koji, possibly due to a mock issue (rhbz#714627)') - def test_fork(self): - debug("calling pty.fork()") - pid, master_fd = pty.fork() diff --git a/python3/patches/00153-fix-test_gdb-noise.patch b/python3/patches/00153-fix-test_gdb-noise.patch deleted file mode 100644 index cc9ed8c..0000000 --- a/python3/patches/00153-fix-test_gdb-noise.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up cpython-59223da36dec/Lib/test/test_gdb.py.fix-test_gdb-noise cpython-59223da36dec/Lib/test/test_gdb.py ---- cpython-59223da36dec/Lib/test/test_gdb.py.fix-test_gdb-noise 2012-08-07 06:10:57.000000000 -0400 -+++ cpython-59223da36dec/Lib/test/test_gdb.py 2012-08-07 17:13:46.592343113 -0400 -@@ -115,6 +115,15 @@ class DebuggerTests(unittest.TestCase): - # Generate a list of commands in gdb's language: - commands = ['set breakpoint pending yes', - 'break %s' % breakpoint, -+ -+ # GDB as of Fedora 17 onwards can distinguish between the -+ # value of a variable at entry vs current value: -+ # http://sourceware.org/gdb/onlinedocs/gdb/Variables.html -+ # which leads to the selftests failing with errors like this: -+ # AssertionError: 'v@entry=()' != '()' -+ # Disable this: -+ 'set print entry-values no', -+ - 'run'] - if cmds_after_breakpoint: - commands += cmds_after_breakpoint -@@ -154,8 +163,16 @@ class DebuggerTests(unittest.TestCase): - err = err.replace("warning: Cannot initialize thread debugging" - " library: Debugger service failed\n", - '') -- -+ err = '\n'.join([line -+ for line in err.splitlines() -+ if not line.startswith('warning: Unable to open') -+ if not line.startswith('Missing separate debuginfo for') -+ if not line.startswith('Try: yum --disablerepo=') -+ # In case 'set print entry-values no' failed: -+ if not line.startswith('Undefined set print command')]) -+ - # Ensure no unexpected error messages: -+ self.maxDiff = None - self.assertEqual(err, '') - return out - diff --git a/python3/patches/00155-avoid-ctypes-thunks.patch b/python3/patches/00155-avoid-ctypes-thunks.patch deleted file mode 100644 index f03890e..0000000 --- a/python3/patches/00155-avoid-ctypes-thunks.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up Python-3.2.3/Lib/ctypes/__init__.py.rhbz814391 Python-3.2.3/Lib/ctypes/__init__.py ---- Python-3.2.3/Lib/ctypes/__init__.py.rhbz814391 2012-04-20 15:12:49.017867692 -0400 -+++ Python-3.2.3/Lib/ctypes/__init__.py 2012-04-20 15:15:09.501111408 -0400 -@@ -275,11 +275,6 @@ def _reset_cache(): - # _SimpleCData.c_char_p_from_param - POINTER(c_char).from_param = c_char_p.from_param - _pointer_type_cache[None] = c_void_p -- # XXX for whatever reasons, creating the first instance of a callback -- # function is needed for the unittests on Win64 to succeed. This MAY -- # be a compiler bug, since the problem occurs only when _ctypes is -- # compiled with the MS SDK compiler. Or an uninitialized variable? -- CFUNCTYPE(c_int)(lambda: None) - - def create_unicode_buffer(init, size=None): - """create_unicode_buffer(aString) -> character array diff --git a/python3/patches/00156-gdb-autoload-safepath.patch b/python3/patches/00156-gdb-autoload-safepath.patch deleted file mode 100644 index ac2aa40..0000000 --- a/python3/patches/00156-gdb-autoload-safepath.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up Python-3.2.3/Lib/test/test_gdb.py.gdb-autoload-safepath Python-3.2.3/Lib/test/test_gdb.py ---- Python-3.2.3/Lib/test/test_gdb.py.gdb-autoload-safepath 2012-04-30 17:16:24.092706954 -0400 -+++ Python-3.2.3/Lib/test/test_gdb.py 2012-04-30 17:17:13.275703592 -0400 -@@ -46,6 +46,19 @@ def gdb_has_frame_select(): - - HAS_PYUP_PYDOWN = gdb_has_frame_select() - -+def gdb_has_autoload_safepath(): -+ # Recent GDBs will only auto-load scripts from certain safe -+ # locations, so we will need to turn off this protection. -+ # However, if the GDB doesn't have it, then the following -+ # command will generate noise on stderr (rhbz#817072): -+ cmd = "--eval-command=set auto-load safe-path /" -+ p = subprocess.Popen(["gdb", "--batch", cmd], -+ stderr=subprocess.PIPE) -+ _, stderr = p.communicate() -+ return b'"on" or "off" expected.' not in stderr -+ -+HAS_AUTOLOAD_SAFEPATH = gdb_has_autoload_safepath() -+ - BREAKPOINT_FN='builtin_id' - - class DebuggerTests(unittest.TestCase): -@@ -106,15 +119,28 @@ class DebuggerTests(unittest.TestCase): - 'set print entry-values no', - - 'run'] -+ -+ if HAS_AUTOLOAD_SAFEPATH: -+ # Recent GDBs will only auto-load scripts from certain safe -+ # locations. -+ # Where necessary, turn off this protection to ensure that -+ # our -gdb.py script can be loaded - but not on earlier gdb builds -+ # as this would generate noise on stderr (rhbz#817072): -+ init_commands = ['set auto-load safe-path /'] -+ else: -+ init_commands = [] -+ - if cmds_after_breakpoint: - commands += cmds_after_breakpoint - else: - commands += ['backtrace'] - -+ # print init_commands - # print commands - - # Use "commands" to generate the arguments with which to invoke "gdb": - args = ["gdb", "--batch"] -+ args += ['--init-eval-command=%s' % cmd for cmd in init_commands] - args += ['--eval-command=%s' % cmd for cmd in commands] - args += ["--args", - sys.executable] diff --git a/python3/patches/00157-uid-gid-overflows.patch b/python3/patches/00157-uid-gid-overflows.patch deleted file mode 100644 index ab4cb0c..0000000 --- a/python3/patches/00157-uid-gid-overflows.patch +++ /dev/null @@ -1,696 +0,0 @@ -diff -up Python-3.3.0b1/Include/modsupport.h.uid-gid-overflows Python-3.3.0b1/Include/modsupport.h ---- Python-3.3.0b1/Include/modsupport.h.uid-gid-overflows 2012-06-26 16:19:40.000000000 -0400 -+++ Python-3.3.0b1/Include/modsupport.h 2012-07-20 14:21:46.854688763 -0400 -@@ -8,6 +8,7 @@ extern "C" { - /* Module support interface */ - - #include <stdarg.h> -+#include <sys/types.h> - - /* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier - to mean Py_ssize_t */ -@@ -125,6 +126,17 @@ PyAPI_FUNC(PyObject *) PyModule_Create2( - PyAPI_DATA(char *) _Py_PackageContext; - #endif - -+/* -+ Non-standard extension: support for dealing with uid_t and gid_t without -+ integer overflow -+ */ -+ -+PyAPI_FUNC(PyObject *) _PyObject_FromUid(uid_t uid); -+PyAPI_FUNC(PyObject *) _PyObject_FromGid(gid_t gid); -+ -+PyAPI_FUNC(int) _PyArg_ParseUid(PyObject *in_obj, uid_t *out_uid); -+PyAPI_FUNC(int) _PyArg_ParseGid(PyObject *in_obj, gid_t *out_gid); -+ - #ifdef __cplusplus - } - #endif -diff -up Python-3.3.0b1/Lib/test/test_os.py.uid-gid-overflows Python-3.3.0b1/Lib/test/test_os.py ---- Python-3.3.0b1/Lib/test/test_os.py.uid-gid-overflows 2012-06-26 16:19:48.000000000 -0400 -+++ Python-3.3.0b1/Lib/test/test_os.py 2012-07-20 14:21:46.856688739 -0400 -@@ -1174,30 +1174,36 @@ if sys.platform != 'win32': - def test_setuid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setuid, 0) -+ self.assertRaises(TypeError, os.setuid, 'not an int') - self.assertRaises(OverflowError, os.setuid, 1<<32) - - if hasattr(os, 'setgid'): - def test_setgid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setgid, 0) -+ self.assertRaises(TypeError, os.setgid, 'not an int') - self.assertRaises(OverflowError, os.setgid, 1<<32) - - if hasattr(os, 'seteuid'): - def test_seteuid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.seteuid, 0) -+ self.assertRaises(TypeError, os.seteuid, 'not an int') - self.assertRaises(OverflowError, os.seteuid, 1<<32) - - if hasattr(os, 'setegid'): - def test_setegid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setegid, 0) -+ self.assertRaises(TypeError, os.setegid, 'not an int') - self.assertRaises(OverflowError, os.setegid, 1<<32) - - if hasattr(os, 'setreuid'): - def test_setreuid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setreuid, 0, 0) -+ self.assertRaises(TypeError, os.setreuid, 'not an int', 0) -+ self.assertRaises(TypeError, os.setreuid, 0, 'not an int') - self.assertRaises(OverflowError, os.setreuid, 1<<32, 0) - self.assertRaises(OverflowError, os.setreuid, 0, 1<<32) - -@@ -1212,6 +1218,8 @@ if sys.platform != 'win32': - def test_setregid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setregid, 0, 0) -+ self.assertRaises(TypeError, os.setregid, 'not an int', 0) -+ self.assertRaises(TypeError, os.setregid, 0, 'not an int') - self.assertRaises(OverflowError, os.setregid, 1<<32, 0) - self.assertRaises(OverflowError, os.setregid, 0, 1<<32) - -diff -up Python-3.3.0b1/Lib/test/test_posix.py.uid-gid-overflows Python-3.3.0b1/Lib/test/test_posix.py ---- Python-3.3.0b1/Lib/test/test_posix.py.uid-gid-overflows 2012-06-26 16:19:48.000000000 -0400 -+++ Python-3.3.0b1/Lib/test/test_posix.py 2012-07-20 14:21:46.857688726 -0400 -@@ -387,10 +387,17 @@ class PosixTester(unittest.TestCase): - else: - self.assertTrue(stat.S_ISFIFO(posix.stat(support.TESTFN).st_mode)) - -- def _test_all_chown_common(self, chown_func, first_param): -+ def _test_all_chown_common(self, chown_func, stat_func, first_param): - """Common code for chown, fchown and lchown tests.""" - # test a successful chown call - chown_func(first_param, os.getuid(), os.getgid()) -+ self.assertEqual(stat_func(first_param).st_uid, os.getuid()) -+ self.assertEqual(stat_func(first_param).st_gid, os.getgid()) -+ -+ # verify that -1 works as a "do-nothing" option: -+ chown_func(first_param, -1, -1) -+ self.assertEqual(stat_func(first_param).st_uid, os.getuid()) -+ self.assertEqual(stat_func(first_param).st_gid, os.getgid()) - - if os.getuid() == 0: - try: -@@ -421,7 +428,7 @@ class PosixTester(unittest.TestCase): - - # re-create the file - support.create_empty_file(support.TESTFN) -- self._test_all_chown_common(posix.chown, support.TESTFN) -+ self._test_all_chown_common(posix.chown, posix.stat, support.TESTFN) - - @unittest.skipUnless(hasattr(posix, 'fchown'), "test needs os.fchown()") - def test_fchown(self): -@@ -431,7 +438,7 @@ class PosixTester(unittest.TestCase): - test_file = open(support.TESTFN, 'w') - try: - fd = test_file.fileno() -- self._test_all_chown_common(posix.fchown, fd) -+ self._test_all_chown_common(posix.fchown, posix.fstat, fd) - finally: - test_file.close() - -@@ -440,7 +447,7 @@ class PosixTester(unittest.TestCase): - os.unlink(support.TESTFN) - # create a symlink - os.symlink(_DUMMY_SYMLINK, support.TESTFN) -- self._test_all_chown_common(posix.lchown, support.TESTFN) -+ self._test_all_chown_common(posix.lchown, posix.lstat, support.TESTFN) - - def test_chdir(self): - if hasattr(posix, 'chdir'): -diff -up Python-3.3.0b1/Lib/test/test_pwd.py.uid-gid-overflows Python-3.3.0b1/Lib/test/test_pwd.py ---- Python-3.3.0b1/Lib/test/test_pwd.py.uid-gid-overflows 2012-06-26 16:19:48.000000000 -0400 -+++ Python-3.3.0b1/Lib/test/test_pwd.py 2012-07-20 14:21:46.857688726 -0400 -@@ -87,9 +87,9 @@ class PwdTest(unittest.TestCase): - # In some cases, byuids isn't a complete list of all users in the - # system, so if we try to pick a value not in byuids (via a perturbing - # loop, say), pwd.getpwuid() might still be able to find data for that -- # uid. Using sys.maxint may provoke the same problems, but hopefully -+ # uid. Using 2**32 - 2 may provoke the same problems, but hopefully - # it will be a more repeatable failure. -- fakeuid = sys.maxsize -+ fakeuid = 2**32 - 2 - self.assertNotIn(fakeuid, byuids) - self.assertRaises(KeyError, pwd.getpwuid, fakeuid) - -diff -up Python-3.3.0b1/Modules/grpmodule.c.uid-gid-overflows Python-3.3.0b1/Modules/grpmodule.c ---- Python-3.3.0b1/Modules/grpmodule.c.uid-gid-overflows 2012-06-26 16:19:54.000000000 -0400 -+++ Python-3.3.0b1/Modules/grpmodule.c 2012-07-20 14:21:46.858688713 -0400 -@@ -69,7 +69,7 @@ mkgrent(struct group *p) - Py_INCREF(Py_None); - } - #endif -- SET(setIndex++, PyLong_FromLong((long) p->gr_gid)); -+ SET(setIndex++, _PyObject_FromGid(p->gr_gid)); - SET(setIndex++, w); - #undef SET - -@@ -84,18 +84,16 @@ mkgrent(struct group *p) - static PyObject * - grp_getgrgid(PyObject *self, PyObject *pyo_id) - { -- PyObject *py_int_id; -- unsigned int gid; -+ gid_t gid; - struct group *p; - -- py_int_id = PyNumber_Long(pyo_id); -- if (!py_int_id) -- return NULL; -- gid = PyLong_AS_LONG(py_int_id); -- Py_DECREF(py_int_id); -+ if (!_PyArg_ParseGid(pyo_id, &gid)) { -+ return NULL; -+ } - - if ((p = getgrgid(gid)) == NULL) { -- PyErr_Format(PyExc_KeyError, "getgrgid(): gid not found: %d", gid); -+ PyErr_Format(PyExc_KeyError, -+ "getgrgid(): gid not found: %lu", (unsigned long)gid); - return NULL; - } - return mkgrent(p); -diff -up Python-3.3.0b1/Modules/posixmodule.c.uid-gid-overflows Python-3.3.0b1/Modules/posixmodule.c ---- Python-3.3.0b1/Modules/posixmodule.c.uid-gid-overflows 2012-07-20 14:21:46.788689588 -0400 -+++ Python-3.3.0b1/Modules/posixmodule.c 2012-07-20 14:24:19.626778849 -0400 -@@ -2151,8 +2151,8 @@ _pystat_fromstructstat(STRUCT_STAT *st) - PyStructSequence_SET_ITEM(v, 2, PyLong_FromLong((long)st->st_dev)); - #endif - PyStructSequence_SET_ITEM(v, 3, PyLong_FromLong((long)st->st_nlink)); -- PyStructSequence_SET_ITEM(v, 4, PyLong_FromLong((long)st->st_uid)); -- PyStructSequence_SET_ITEM(v, 5, PyLong_FromLong((long)st->st_gid)); -+ PyStructSequence_SET_ITEM(v, 4, _PyObject_FromUid(st->st_uid)); -+ PyStructSequence_SET_ITEM(v, 5, _PyObject_FromGid(st->st_gid)); - #ifdef HAVE_LARGEFILE_SUPPORT - PyStructSequence_SET_ITEM(v, 6, - PyLong_FromLongLong((PY_LONG_LONG)st->st_size)); -@@ -2957,7 +2957,6 @@ static PyObject * - posix_chown(PyObject *self, PyObject *args, PyObject *kwargs) - { - path_t path; -- long uid_l, gid_l; - uid_t uid; - gid_t gid; - int dir_fd = DEFAULT_DIR_FD; -@@ -2971,9 +2970,10 @@ posix_chown(PyObject *self, PyObject *ar - #ifdef HAVE_FCHOWN - path.allow_fd = 1; - #endif -- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&ll|$O&p:chown", keywords, -+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&O&|$O&p:chown", keywords, - path_converter, &path, -- &uid_l, &gid_l, -+ _PyArg_ParseUid, &uid, -+ _PyArg_ParseGid, &gid, - #ifdef HAVE_FCHOWNAT - dir_fd_converter, &dir_fd, - #else -@@ -3004,8 +3004,6 @@ posix_chown(PyObject *self, PyObject *ar - #endif - - Py_BEGIN_ALLOW_THREADS -- uid = (uid_t)uid_l; -- gid = (uid_t)gid_l; - #ifdef HAVE_FCHOWN - if (path.fd != -1) - result = fchown(path.fd, uid, gid); -@@ -3049,12 +3047,15 @@ static PyObject * - posix_fchown(PyObject *self, PyObject *args) - { - int fd; -- long uid, gid; -+ uid_t uid; -+ gid_t gid; - int res; -- if (!PyArg_ParseTuple(args, "ill:fchown", &fd, &uid, &gid)) -+ if (!PyArg_ParseTuple(args, "iO&O&:chown", &fd, -+ _PyArg_ParseUid, &uid, -+ _PyArg_ParseGid, &gid)) - return NULL; - Py_BEGIN_ALLOW_THREADS -- res = fchown(fd, (uid_t) uid, (gid_t) gid); -+ res = fchown(fd, uid, gid); - Py_END_ALLOW_THREADS - if (res < 0) - return posix_error(); -@@ -3074,15 +3075,17 @@ posix_lchown(PyObject *self, PyObject *a - { - PyObject *opath; - char *path; -- long uid, gid; -+ uid_t uid; -+ gid_t gid; - int res; -- if (!PyArg_ParseTuple(args, "O&ll:lchown", -+ if (!PyArg_ParseTuple(args, "O&O&O&:lchown", - PyUnicode_FSConverter, &opath, -- &uid, &gid)) -+ _PyArg_ParseUid, &uid, -+ _PyArg_ParseGid, &gid)) - return NULL; - path = PyBytes_AsString(opath); - Py_BEGIN_ALLOW_THREADS -- res = lchown(path, (uid_t) uid, (gid_t) gid); -+ res = lchown(path, uid, gid); - Py_END_ALLOW_THREADS - if (res < 0) - return posix_error_with_allocated_filename(opath); -@@ -6184,7 +6187,7 @@ Return the current process's effective g - static PyObject * - posix_getegid(PyObject *self, PyObject *noargs) - { -- return PyLong_FromLong((long)getegid()); -+ return _PyObject_FromGid(getegid()); - } - #endif - -@@ -6197,7 +6200,7 @@ Return the current process's effective u - static PyObject * - posix_geteuid(PyObject *self, PyObject *noargs) - { -- return PyLong_FromLong((long)geteuid()); -+ return _PyObject_FromUid(geteuid()); - } - #endif - -@@ -6210,7 +6213,7 @@ Return the current process's group id.") - static PyObject * - posix_getgid(PyObject *self, PyObject *noargs) - { -- return PyLong_FromLong((long)getgid()); -+ return _PyObject_FromGid(getgid()); - } - #endif - -@@ -6349,7 +6352,7 @@ posix_getgroups(PyObject *self, PyObject - if (result != NULL) { - int i; - for (i = 0; i < n; ++i) { -- PyObject *o = PyLong_FromLong((long)alt_grouplist[i]); -+ PyObject *o = _PyObject_FromGid(alt_grouplist[i]); - if (o == NULL) { - Py_DECREF(result); - result = NULL; -@@ -6380,14 +6383,15 @@ posix_initgroups(PyObject *self, PyObjec - PyObject *oname; - char *username; - int res; -- long gid; -+ gid_t gid; - -- if (!PyArg_ParseTuple(args, "O&l:initgroups", -- PyUnicode_FSConverter, &oname, &gid)) -+ if (!PyArg_ParseTuple(args, "O&O&:initgroups", -+ PyUnicode_FSConverter, &oname, -+ _PyArg_ParseGid, &gid)) - return NULL; - username = PyBytes_AS_STRING(oname); - -- res = initgroups(username, (gid_t) gid); -+ res = initgroups(username, gid); - Py_DECREF(oname); - if (res == -1) - return PyErr_SetFromErrno(PyExc_OSError); -@@ -6562,7 +6566,7 @@ Return the current process's user id."); - static PyObject * - posix_getuid(PyObject *self, PyObject *noargs) - { -- return PyLong_FromLong((long)getuid()); -+ return _PyObject_FromUid(getuid()); - } - #endif - -@@ -6702,15 +6706,9 @@ Set the current process's user id."); - static PyObject * - posix_setuid(PyObject *self, PyObject *args) - { -- long uid_arg; - uid_t uid; -- if (!PyArg_ParseTuple(args, "l:setuid", &uid_arg)) -- return NULL; -- uid = uid_arg; -- if (uid != uid_arg) { -- PyErr_SetString(PyExc_OverflowError, "user id too big"); -+ if (!PyArg_ParseTuple(args, "O&:setuid", _PyArg_ParseUid, &uid)) - return NULL; -- } - if (setuid(uid) < 0) - return posix_error(); - Py_INCREF(Py_None); -@@ -6727,15 +6725,9 @@ Set the current process's effective user - static PyObject * - posix_seteuid (PyObject *self, PyObject *args) - { -- long euid_arg; - uid_t euid; -- if (!PyArg_ParseTuple(args, "l", &euid_arg)) -+ if (!PyArg_ParseTuple(args, "O&:seteuid", _PyArg_ParseUid, &euid)) - return NULL; -- euid = euid_arg; -- if (euid != euid_arg) { -- PyErr_SetString(PyExc_OverflowError, "user id too big"); -- return NULL; -- } - if (seteuid(euid) < 0) { - return posix_error(); - } else { -@@ -6753,15 +6745,9 @@ Set the current process's effective grou - static PyObject * - posix_setegid (PyObject *self, PyObject *args) - { -- long egid_arg; - gid_t egid; -- if (!PyArg_ParseTuple(args, "l", &egid_arg)) -- return NULL; -- egid = egid_arg; -- if (egid != egid_arg) { -- PyErr_SetString(PyExc_OverflowError, "group id too big"); -+ if (!PyArg_ParseTuple(args, "O&:setegid", _PyArg_ParseGid, &egid)) - return NULL; -- } - if (setegid(egid) < 0) { - return posix_error(); - } else { -@@ -6779,23 +6765,11 @@ Set the current process's real and effec - static PyObject * - posix_setreuid (PyObject *self, PyObject *args) - { -- long ruid_arg, euid_arg; - uid_t ruid, euid; -- if (!PyArg_ParseTuple(args, "ll", &ruid_arg, &euid_arg)) -- return NULL; -- if (ruid_arg == -1) -- ruid = (uid_t)-1; /* let the compiler choose how -1 fits */ -- else -- ruid = ruid_arg; /* otherwise, assign from our long */ -- if (euid_arg == -1) -- euid = (uid_t)-1; -- else -- euid = euid_arg; -- if ((euid_arg != -1 && euid != euid_arg) || -- (ruid_arg != -1 && ruid != ruid_arg)) { -- PyErr_SetString(PyExc_OverflowError, "user id too big"); -+ if (!PyArg_ParseTuple(args, "O&O&", -+ _PyArg_ParseUid, &ruid, -+ _PyArg_ParseUid, &euid)) - return NULL; -- } - if (setreuid(ruid, euid) < 0) { - return posix_error(); - } else { -@@ -6813,23 +6787,11 @@ Set the current process's real and effec - static PyObject * - posix_setregid (PyObject *self, PyObject *args) - { -- long rgid_arg, egid_arg; - gid_t rgid, egid; -- if (!PyArg_ParseTuple(args, "ll", &rgid_arg, &egid_arg)) -- return NULL; -- if (rgid_arg == -1) -- rgid = (gid_t)-1; /* let the compiler choose how -1 fits */ -- else -- rgid = rgid_arg; /* otherwise, assign from our long */ -- if (egid_arg == -1) -- egid = (gid_t)-1; -- else -- egid = egid_arg; -- if ((egid_arg != -1 && egid != egid_arg) || -- (rgid_arg != -1 && rgid != rgid_arg)) { -- PyErr_SetString(PyExc_OverflowError, "group id too big"); -+ if (!PyArg_ParseTuple(args, "O&O&", -+ _PyArg_ParseGid, &rgid, -+ _PyArg_ParseGid, &egid)) - return NULL; -- } - if (setregid(rgid, egid) < 0) { - return posix_error(); - } else { -@@ -6847,15 +6809,9 @@ Set the current process's group id."); - static PyObject * - posix_setgid(PyObject *self, PyObject *args) - { -- long gid_arg; - gid_t gid; -- if (!PyArg_ParseTuple(args, "l:setgid", &gid_arg)) -+ if (!PyArg_ParseTuple(args, "O&:setgid", _PyArg_ParseGid, &gid)) - return NULL; -- gid = gid_arg; -- if (gid != gid_arg) { -- PyErr_SetString(PyExc_OverflowError, "group id too big"); -- return NULL; -- } - if (setgid(gid) < 0) - return posix_error(); - Py_INCREF(Py_None); -@@ -6888,27 +6844,9 @@ posix_setgroups(PyObject *self, PyObject - elem = PySequence_GetItem(groups, i); - if (!elem) - return NULL; -- if (!PyLong_Check(elem)) { -- PyErr_SetString(PyExc_TypeError, -- "groups must be integers"); -+ if (!_PyArg_ParseGid(elem, &grouplist[i])) { - Py_DECREF(elem); - return NULL; -- } else { -- unsigned long x = PyLong_AsUnsignedLong(elem); -- if (PyErr_Occurred()) { -- PyErr_SetString(PyExc_TypeError, -- "group id too big"); -- Py_DECREF(elem); -- return NULL; -- } -- grouplist[i] = x; -- /* read back the value to see if it fitted in gid_t */ -- if (grouplist[i] != x) { -- PyErr_SetString(PyExc_TypeError, -- "group id too big"); -- Py_DECREF(elem); -- return NULL; -- } - } - Py_DECREF(elem); - } -@@ -10388,9 +10326,11 @@ Set the current process's real, effectiv - static PyObject* - posix_setresuid (PyObject *self, PyObject *args) - { -- /* We assume uid_t is no larger than a long. */ -- long ruid, euid, suid; -- if (!PyArg_ParseTuple(args, "lll", &ruid, &euid, &suid)) -+ uid_t ruid, euid, suid; -+ if (!PyArg_ParseTuple(args, "O&O&O&", -+ _PyArg_ParseUid, &ruid, -+ _PyArg_ParseUid, &euid, -+ _PyArg_ParseUid, &suid)) - return NULL; - if (setresuid(ruid, euid, suid) < 0) - return posix_error(); -@@ -10406,9 +10346,11 @@ Set the current process's real, effectiv - static PyObject* - posix_setresgid (PyObject *self, PyObject *args) - { -- /* We assume uid_t is no larger than a long. */ -- long rgid, egid, sgid; -- if (!PyArg_ParseTuple(args, "lll", &rgid, &egid, &sgid)) -+ gid_t rgid, egid, sgid; -+ if (!PyArg_ParseTuple(args, "O&O&O&", -+ _PyArg_ParseGid, &rgid, -+ _PyArg_ParseGid, &egid, -+ _PyArg_ParseGid, &sgid)) - return NULL; - if (setresgid(rgid, egid, sgid) < 0) - return posix_error(); -@@ -10425,14 +10367,13 @@ static PyObject* - posix_getresuid (PyObject *self, PyObject *noargs) - { - uid_t ruid, euid, suid; -- long l_ruid, l_euid, l_suid; -+ PyObject *obj_ruid, *obj_euid, *obj_suid; - if (getresuid(&ruid, &euid, &suid) < 0) - return posix_error(); -- /* Force the values into long's as we don't know the size of uid_t. */ -- l_ruid = ruid; -- l_euid = euid; -- l_suid = suid; -- return Py_BuildValue("(lll)", l_ruid, l_euid, l_suid); -+ obj_ruid = _PyObject_FromUid(ruid); -+ obj_euid = _PyObject_FromUid(euid); -+ obj_suid = _PyObject_FromUid(suid); -+ return Py_BuildValue("(NNN)", obj_ruid, obj_euid, obj_suid); - } - #endif - -@@ -10445,14 +10386,13 @@ static PyObject* - posix_getresgid (PyObject *self, PyObject *noargs) - { - uid_t rgid, egid, sgid; -- long l_rgid, l_egid, l_sgid; -+ PyObject *obj_rgid, *obj_egid, *obj_sgid; - if (getresgid(&rgid, &egid, &sgid) < 0) - return posix_error(); -- /* Force the values into long's as we don't know the size of uid_t. */ -- l_rgid = rgid; -- l_egid = egid; -- l_sgid = sgid; -- return Py_BuildValue("(lll)", l_rgid, l_egid, l_sgid); -+ obj_rgid = _PyObject_FromGid(rgid); -+ obj_egid = _PyObject_FromGid(egid); -+ obj_sgid = _PyObject_FromGid(sgid); -+ return Py_BuildValue("(NNN)", obj_rgid, obj_egid, obj_sgid); - } - #endif - -diff -up Python-3.3.0b1/Modules/pwdmodule.c.uid-gid-overflows Python-3.3.0b1/Modules/pwdmodule.c ---- Python-3.3.0b1/Modules/pwdmodule.c.uid-gid-overflows 2012-06-26 16:19:54.000000000 -0400 -+++ Python-3.3.0b1/Modules/pwdmodule.c 2012-07-20 14:21:46.861688675 -0400 -@@ -74,8 +74,8 @@ mkpwent(struct passwd *p) - #else - SETS(setIndex++, p->pw_passwd); - #endif -- SETI(setIndex++, p->pw_uid); -- SETI(setIndex++, p->pw_gid); -+ PyStructSequence_SET_ITEM(v, setIndex++, _PyObject_FromUid(p->pw_uid)); -+ PyStructSequence_SET_ITEM(v, setIndex++, _PyObject_FromGid(p->pw_gid)); - #ifdef __VMS - SETS(setIndex++, ""); - #else -@@ -104,13 +104,14 @@ See help(pwd) for more on password datab - static PyObject * - pwd_getpwuid(PyObject *self, PyObject *args) - { -- unsigned int uid; -+ uid_t uid; - struct passwd *p; -- if (!PyArg_ParseTuple(args, "I:getpwuid", &uid)) -+ if (!PyArg_ParseTuple(args, "O&:getpwuid", -+ _PyArg_ParseUid, &uid)) - return NULL; - if ((p = getpwuid(uid)) == NULL) { - PyErr_Format(PyExc_KeyError, -- "getpwuid(): uid not found: %d", uid); -+ "getpwuid(): uid not found: %lu", (unsigned long)uid); - return NULL; - } - return mkpwent(p); -diff -up Python-3.3.0b1/Python/getargs.c.uid-gid-overflows Python-3.3.0b1/Python/getargs.c ---- Python-3.3.0b1/Python/getargs.c.uid-gid-overflows 2012-06-26 16:19:57.000000000 -0400 -+++ Python-3.3.0b1/Python/getargs.c 2012-07-20 14:21:46.861688675 -0400 -@@ -4,6 +4,7 @@ - #include "Python.h" - - #include <ctype.h> -+#include <limits.h> - - - #ifdef __cplusplus -@@ -1807,6 +1808,102 @@ _PyArg_NoKeywords(const char *funcname, - funcname); - return 0; - } -+ -+PyObject * -+_PyObject_FromUid(uid_t uid) -+{ -+ return PyLong_FromUnsignedLong((uid_t)uid); -+} -+ -+PyObject * -+_PyObject_FromGid(gid_t gid) -+{ -+ return PyLong_FromUnsignedLong((gid_t)gid); -+} -+ -+int -+_PyArg_ParseUid(PyObject *in_obj, uid_t *out_uid) -+{ -+ PyObject *index, *number = NULL; -+ long sl; -+ unsigned long ul; -+ -+ assert(out_uid); -+ -+ index = PyNumber_Index(in_obj); -+ if (index != NULL) { -+ number = PyNumber_Long(index); -+ Py_DECREF(index); -+ } -+ if (number == NULL) { -+ PyErr_SetString(PyExc_TypeError, "user id must be integer"); -+ return 0; -+ } -+ -+ /* Special case: support -1 (e.g. for use by chown) */ -+ sl = PyLong_AsLong(number); -+ if (PyErr_Occurred()) { -+ PyErr_Clear(); -+ } else if (sl == -1) { -+ Py_DECREF(number); -+ *out_uid = (uid_t)-1; -+ return 1; -+ } -+ -+ /* Otherwise, it must be >= 0 */ -+ ul = PyLong_AsUnsignedLong(number); -+ Py_DECREF(number); -+ *out_uid = ul; -+ /* read back the value to see if it fitted in uid_t */ -+ if (PyErr_Occurred() || *out_uid != ul) { -+ PyErr_SetString(PyExc_OverflowError, -+ "user id is not in range(-1, 2^32-1)"); -+ return 0; -+ } -+ return 1; -+} -+ -+int -+_PyArg_ParseGid(PyObject *in_obj, gid_t *out_gid) -+{ -+ PyObject *index, *number = NULL; -+ long sl; -+ unsigned long ul; -+ -+ assert(out_gid); -+ -+ index = PyNumber_Index(in_obj); -+ if (index != NULL) { -+ number = PyNumber_Long(index); -+ Py_DECREF(index); -+ } -+ if (number == NULL) { -+ PyErr_SetString(PyExc_TypeError, "group id must be integer"); -+ return 0; -+ } -+ -+ /* Special case: support -1 (e.g. for use by chown) */ -+ sl = PyLong_AsLong(number); -+ if (PyErr_Occurred()) { -+ PyErr_Clear(); -+ } else if (sl == -1) { -+ Py_DECREF(number); -+ *out_gid = (gid_t)-1; -+ return 1; -+ } -+ -+ ul = PyLong_AsUnsignedLong(number); -+ Py_DECREF(number); -+ *out_gid = ul; -+ /* read back the value to see if it fitted in gid_t */ -+ if (PyErr_Occurred() || *out_gid != ul) { -+ PyErr_SetString(PyExc_OverflowError, -+ "group id is not in range(-1, 2^32-1)"); -+ return 0; -+ } -+ return 1; -+} -+ - #ifdef __cplusplus - }; - #endif diff --git a/python3/patches/00160-disable-test_fs_holes-in-rpm-build.patch b/python3/patches/00160-disable-test_fs_holes-in-rpm-build.patch deleted file mode 100644 index 9fa91d5..0000000 --- a/python3/patches/00160-disable-test_fs_holes-in-rpm-build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cpython-59223da36dec/Lib/test/test_posix.py.disable-test_fs_holes-in-rpm-build cpython-59223da36dec/Lib/test/test_posix.py ---- cpython-59223da36dec/Lib/test/test_posix.py.disable-test_fs_holes-in-rpm-build 2012-08-07 17:15:59.000000000 -0400 -+++ cpython-59223da36dec/Lib/test/test_posix.py 2012-08-07 17:16:53.528330330 -0400 -@@ -973,6 +973,7 @@ class PosixTester(unittest.TestCase): - posix.RTLD_GLOBAL - posix.RTLD_LOCAL - -+ @unittest._skipInRpmBuild('running kernel may not match kernel in chroot') - @unittest.skipUnless(hasattr(os, 'SEEK_HOLE'), - "test needs an OS that reports file holes") - def test_fs_holes(self): diff --git a/python3/patches/00163-disable-parts-of-test_socket-in-rpm-build.patch b/python3/patches/00163-disable-parts-of-test_socket-in-rpm-build.patch deleted file mode 100644 index 0e28036..0000000 --- a/python3/patches/00163-disable-parts-of-test_socket-in-rpm-build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up Python-3.3.0b1/Lib/test/test_socket.py.disable-test_socket-in-rpm-builds Python-3.3.0b1/Lib/test/test_socket.py ---- Python-3.3.0b1/Lib/test/test_socket.py.disable-test_socket-in-rpm-builds 2012-07-24 15:02:30.823355067 -0400 -+++ Python-3.3.0b1/Lib/test/test_socket.py 2012-07-24 15:08:13.021354999 -0400 -@@ -2188,6 +2188,7 @@ class RecvmsgGenericStreamTests(RecvmsgG - # Tests which require a stream socket and can use either recvmsg() - # or recvmsg_into(). - -+ @unittest._skipInRpmBuild('fails intermittently when run within Koji') - def testRecvmsgEOF(self): - # Receive end-of-stream indicator (b"", peer socket closed). - msg, ancdata, flags, addr = self.doRecvmsg(self.serv_sock, 1024) diff --git a/python3/patches/00164-disable-interrupted_write-tests-on-ppc.patch b/python3/patches/00164-disable-interrupted_write-tests-on-ppc.patch deleted file mode 100644 index 0db8092..0000000 --- a/python3/patches/00164-disable-interrupted_write-tests-on-ppc.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up Python-3.3.0b1/Lib/test/test_exceptions.py.846849 Python-3.3.0b1/Lib/test/test_exceptions.py ---- Python-3.3.0b1/Lib/test/test_exceptions.py.846849 2012-06-26 22:19:47.000000000 +0200 -+++ Python-3.3.0b1/Lib/test/test_exceptions.py 2012-08-13 17:41:28.845403486 +0200 -@@ -401,6 +401,7 @@ class ExceptionTests(unittest.TestCase): - self.assertIsNone(e.__context__) - self.assertIsNone(e.__cause__) - -+ @unittest.skip('rhbz#846849') - def testChainingDescriptors(self): - try: - raise Exception() -diff -up Python-3.3.0b1/Lib/test/test_io.py.846849 Python-3.3.0b1/Lib/test/test_io.py ---- Python-3.3.0b1/Lib/test/test_io.py.846849 2012-06-26 22:19:48.000000000 +0200 -+++ Python-3.3.0b1/Lib/test/test_io.py 2012-08-13 17:41:28.846403451 +0200 -@@ -2938,12 +2938,15 @@ class SignalsTest(unittest.TestCase): - if e.errno != errno.EBADF: - raise - -+ @unittest.skip('rhbz#846849') - def test_interrupted_write_unbuffered(self): - self.check_interrupted_write(b"xy", b"xy", mode="wb", buffering=0) - -+ @unittest.skip('rhbz#846849') - def test_interrupted_write_buffered(self): - self.check_interrupted_write(b"xy", b"xy", mode="wb") - -+ @unittest.skip('rhbz#846849') - def test_interrupted_write_text(self): - self.check_interrupted_write("xy", b"xy", mode="w", encoding="ascii") - -diff -up Python-3.3.0b1/Lib/test/test_raise.py.846849 Python-3.3.0b1/Lib/test/test_raise.py ---- Python-3.3.0b1/Lib/test/test_raise.py.846849 2012-08-13 17:42:16.719714213 +0200 -+++ Python-3.3.0b1/Lib/test/test_raise.py 2012-08-13 17:43:02.544097272 +0200 -@@ -151,6 +151,7 @@ class TestRaise(unittest.TestCase): - - class TestCause(unittest.TestCase): - -+ @unittest.skip('rhbz#846849') - def testCauseSyntax(self): - try: - try: -diff -up Python-3.3.0b1/Lib/test/test_traceback.py.846849 Python-3.3.0b1/Lib/test/test_traceback.py ---- Python-3.3.0b1/Lib/test/test_traceback.py.846849 2012-08-13 17:44:19.714374275 +0200 -+++ Python-3.3.0b1/Lib/test/test_traceback.py 2012-08-13 17:44:43.515534435 +0200 -@@ -246,6 +246,7 @@ class BaseExceptionReportingTests: - self.check_zero_div(blocks[0]) - self.assertIn('inner_raise() # Marker', blocks[2]) - -+ @unittest.skip('rhbz#846849') - def test_context_suppression(self): - try: - try: diff --git a/python3/patches/05000-autotool-intermediates.patch b/python3/patches/05000-autotool-intermediates.patch deleted file mode 100644 index bd9aeca..0000000 --- a/python3/patches/05000-autotool-intermediates.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up ./configure.autotool-intermediates ./configure ---- ./configure.autotool-intermediates 2012-08-07 17:21:25.249311751 -0400 -+++ ./configure 2012-08-07 17:21:35.503311049 -0400 -@@ -779,6 +779,8 @@ with_thread - enable_ipv6 - with_doc_strings - with_tsc -+with_count_allocs -+with_call_profile - with_pymalloc - with_valgrind - with_systemtap -@@ -1457,6 +1459,8 @@ Optional Packages: - deprecated; use --with(out)-threads - --with(out)-doc-strings disable/enable documentation strings - --with(out)-tsc enable/disable timestamp counter profile -+ --with(out)count-allocs enable/disable per-type instance accounting -+ --with(out)-call-profile enable/disable statistics on function call invocation - --with(out)-pymalloc disable/enable specialized mallocs - --with-valgrind Enable Valgrind support - --with(out)-systemtap disable/enable SystemTap support -@@ -10017,6 +10021,50 @@ $as_echo "no" >&6; } - fi - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-count-allocs" >&5 -+$as_echo_n "checking for --with-count-allocs... " >&6; } -+ -+# Check whether --with-count-allocs was given. -+if test "${with_count_allocs+set}" = set; then : -+ withval=$with_count_allocs; -+if test "$withval" != no -+then -+ -+$as_echo "#define COUNT_ALLOCS 1" >>confdefs.h -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-call-profile" >&5 -+$as_echo_n "checking for --with-call-profile... " >&6; } -+ -+# Check whether --with-call-profile was given. -+if test "${with_call_profile+set}" = set; then : -+ withval=$with_call_profile; -+if test "$withval" != no -+then -+ -+$as_echo "#define CALL_PROFILE 1" >>confdefs.h -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ - # Check for Python-specific malloc support - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5 - $as_echo_n "checking for --with-pymalloc... " >&6; } -diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in diff --git a/python3/patches/python-3.2.1-fix-test-subprocess-with-nonreadable-path-dir.patch b/python3/patches/python-3.2.1-fix-test-subprocess-with-nonreadable-path-dir.patch deleted file mode 100644 index 6f43c72..0000000 --- a/python3/patches/python-3.2.1-fix-test-subprocess-with-nonreadable-path-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Python-3.2.1/Lib/test/test_subprocess.py.non-readable-path Python-3.2.1/Lib/test/test_subprocess.py ---- Python-3.2.1/Lib/test/test_subprocess.py.non-readable-path 2011-07-09 02:58:51.000000000 -0400 -+++ Python-3.2.1/Lib/test/test_subprocess.py 2011-07-11 11:34:16.284426005 -0400 -@@ -618,7 +618,7 @@ class ProcessTestCase(BaseTestCase): - for i in range(1024): - # Windows raises IOError. Others raise OSError. - with self.assertRaises(EnvironmentError) as c: -- subprocess.Popen(['nonexisting_i_hope'], -+ subprocess.Popen(['/usr/bin/nonexisting_i_hope'], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - # ignore errors that indicate the command was not found diff --git a/python3/python-3.3.0b1-lib64.patch b/python3/python-3.3.0b1-lib64.patch deleted file mode 100644 index 5ae03aa..0000000 --- a/python3/python-3.3.0b1-lib64.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff -up cpython-59223da36dec/Lib/distutils/command/install.py.lib64 cpython-59223da36dec/Lib/distutils/command/install.py ---- cpython-59223da36dec/Lib/distutils/command/install.py.lib64 2012-08-07 06:10:57.000000000 -0400 -+++ cpython-59223da36dec/Lib/distutils/command/install.py 2012-08-07 16:41:00.573477549 -0400 -@@ -45,14 +45,14 @@ else: - INSTALL_SCHEMES = { - 'unix_prefix': { - 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { - 'purelib': '$base/lib/python', -- 'platlib': '$base/lib/python', -+ 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', -diff -up cpython-59223da36dec/Lib/distutils/sysconfig.py.lib64 cpython-59223da36dec/Lib/distutils/sysconfig.py ---- cpython-59223da36dec/Lib/distutils/sysconfig.py.lib64 2012-08-07 06:10:57.000000000 -0400 -+++ cpython-59223da36dec/Lib/distutils/sysconfig.py 2012-08-07 16:41:00.573477549 -0400 -@@ -139,8 +139,12 @@ def get_python_lib(plat_specific=0, stan - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": -+ if plat_specific or standard_lib: -+ lib = "lib64" -+ else: -+ lib = "lib" - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ lib, "python" + get_python_version()) - if standard_lib: - return libpython - else: -diff -up cpython-59223da36dec/Lib/site.py.lib64 cpython-59223da36dec/Lib/site.py ---- cpython-59223da36dec/Lib/site.py.lib64 2012-08-07 06:10:57.000000000 -0400 -+++ cpython-59223da36dec/Lib/site.py 2012-08-07 16:41:00.573477549 -0400 -@@ -303,12 +303,16 @@ def getsitepackages(prefixes=None): - if sys.platform in ('os2emx', 'riscos'): - sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': -+ sitepackages.append(os.path.join(prefix, "lib64", -+ "python" + sys.version[:3], -+ "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", - "python" + sys.version[:3], - "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-python")) - else: - sitepackages.append(prefix) -+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) - if sys.platform == "darwin": - # for framework builds *only* we add the standard Apple -diff -up cpython-59223da36dec/Lib/sysconfig.py.lib64 cpython-59223da36dec/Lib/sysconfig.py ---- cpython-59223da36dec/Lib/sysconfig.py.lib64 2012-08-07 06:10:57.000000000 -0400 -+++ cpython-59223da36dec/Lib/sysconfig.py 2012-08-07 16:41:00.574477549 -0400 -@@ -21,10 +21,10 @@ __all__ = [ - - _INSTALL_SCHEMES = { - 'posix_prefix': { -- 'stdlib': '{installed_base}/lib/python{py_version_short}', -- 'platstdlib': '{platbase}/lib/python{py_version_short}', -+ 'stdlib': '{installed_base}/lib64/python{py_version_short}', -+ 'platstdlib': '{platbase}/lib64/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', -- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', - 'include': - '{installed_base}/include/python{py_version_short}{abiflags}', - 'platinclude': -@@ -81,10 +81,10 @@ _INSTALL_SCHEMES = { - 'data': '{userbase}', - }, - 'posix_user': { -- 'stdlib': '{userbase}/lib/python{py_version_short}', -- 'platstdlib': '{userbase}/lib/python{py_version_short}', -+ 'stdlib': '{userbase}/lib64/python{py_version_short}', -+ 'platstdlib': '{userbase}/lib64/python{py_version_short}', - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', - 'data': '{userbase}', -diff -up cpython-59223da36dec/Lib/test/test_site.py.lib64 cpython-59223da36dec/Lib/test/test_site.py ---- cpython-59223da36dec/Lib/test/test_site.py.lib64 2012-08-07 06:10:57.000000000 -0400 -+++ cpython-59223da36dec/Lib/test/test_site.py 2012-08-07 16:41:00.574477549 -0400 -@@ -239,12 +239,15 @@ class HelperFunctionsTests(unittest.Test - self.assertEqual(dirs[2], wanted) - elif os.sep == '/': - # OS X non-framwework builds, Linux, FreeBSD, etc -- self.assertEqual(len(dirs), 2) -- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], -+ self.assertEqual(len(dirs), 3) -+ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], - 'site-packages') - self.assertEqual(dirs[0], wanted) -- wanted = os.path.join('xoxo', 'lib', 'site-python') -+ wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], -+ 'site-packages') - self.assertEqual(dirs[1], wanted) -+ wanted = os.path.join('xoxo', 'lib', 'site-python') -+ self.assertEqual(dirs[2], wanted) - else: - # other platforms - self.assertEqual(len(dirs), 2) -diff -up cpython-59223da36dec/Makefile.pre.in.lib64 cpython-59223da36dec/Makefile.pre.in ---- cpython-59223da36dec/Makefile.pre.in.lib64 2012-08-07 16:41:00.557477550 -0400 -+++ cpython-59223da36dec/Makefile.pre.in 2012-08-07 16:41:00.575477549 -0400 -@@ -108,7 +108,7 @@ LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/lib64 - ABIFLAGS= @ABIFLAGS@ - - # Detailed destination directories -diff -up cpython-59223da36dec/Modules/getpath.c.lib64 cpython-59223da36dec/Modules/getpath.c ---- cpython-59223da36dec/Modules/getpath.c.lib64 2012-08-07 06:10:57.000000000 -0400 -+++ cpython-59223da36dec/Modules/getpath.c 2012-08-07 16:41:00.575477549 -0400 -@@ -122,8 +122,8 @@ - #endif - - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ -+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -135,7 +135,7 @@ static wchar_t exec_prefix[MAXPATHLEN+1] - static wchar_t progpath[MAXPATHLEN+1]; - static wchar_t *module_search_path = NULL; - static int module_search_path_malloced = 0; --static wchar_t *lib_python = L"lib/python" VERSION; -+static wchar_t *lib_python = L"lib64/python" VERSION; - - static void - reduce(wchar_t *dir) -@@ -677,7 +677,7 @@ calculate_path(void) - } - else - wcsncpy(zip_path, _prefix, MAXPATHLEN); -- joinpath(zip_path, L"lib/python00.zip"); -+ joinpath(zip_path, L"lib64/python00.zip"); - bufsz = wcslen(zip_path); /* Replace "00" with version */ - zip_path[bufsz - 6] = VERSION[0]; - zip_path[bufsz - 5] = VERSION[2]; -@@ -687,7 +687,7 @@ calculate_path(void) - fprintf(stderr, - "Could not find platform dependent libraries <exec_prefix>\n"); - wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); -- joinpath(exec_prefix, L"lib/lib-dynload"); -+ joinpath(exec_prefix, L"lib64/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - -diff -up cpython-59223da36dec/setup.py.lib64 cpython-59223da36dec/setup.py ---- cpython-59223da36dec/setup.py.lib64 2012-08-07 06:10:57.000000000 -0400 -+++ cpython-59223da36dec/setup.py 2012-08-07 16:41:32.153475390 -0400 -@@ -438,7 +438,7 @@ class PyBuildExt(build_ext): - # directories (i.e. '.' and 'Include') must be first. See issue - # 10520. - if not cross_compiling: -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - # only change this for cross builds for 3.3, issues on Mageia - if cross_compiling: -@@ -708,11 +708,11 @@ class PyBuildExt(build_ext): - elif curses_library: - readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib64/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/lib64/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: -@@ -749,8 +749,8 @@ class PyBuildExt(build_ext): - if krb5_h: - ssl_incs += krb5_h - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, -- ['/usr/local/ssl/lib', -- '/usr/contrib/ssl/lib/' -+ ['/usr/local/ssl/lib64', -+ '/usr/contrib/ssl/lib64/' - ] ) - - if (ssl_incs is not None and diff --git a/python3/python-3.4.3-lib64.patch b/python3/python-3.4.3-lib64.patch new file mode 100644 index 0000000..db5fd95 --- /dev/null +++ b/python3/python-3.4.3-lib64.patch @@ -0,0 +1,192 @@ +--- Python-3.4.0b1/Lib/distutils/command/install.py.lib64 2013-11-24 21:36:54.000000000 +0100 ++++ Python-3.4.0b1/Lib/distutils/command/install.py 2013-11-27 11:10:43.821150774 +0100 +@@ -45,14 +45,14 @@ else: + INSTALL_SCHEMES = { + 'unix_prefix': { + 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, + 'unix_home': { + 'purelib': '$base/lib/python', +- 'platlib': '$base/lib/python', ++ 'platlib': '$base/lib64/python', + 'headers': '$base/include/python/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +--- Python-3.4.0b1/Lib/distutils/sysconfig.py.lib64 2013-11-24 21:36:54.000000000 +0100 ++++ Python-3.4.0b1/Lib/distutils/sysconfig.py 2013-11-27 11:10:43.821150774 +0100 +@@ -141,8 +141,12 @@ + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": ++ if plat_specific or standard_lib: ++ lib = "lib64" ++ else: ++ lib = "lib" + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ lib, "python" + get_python_version()) + if standard_lib: + return libpython + else: +--- Python-3.4.0b1/Lib/site.py.lib64 2013-11-24 21:36:54.000000000 +0100 ++++ Python-3.4.0b1/Lib/site.py 2013-11-27 11:10:43.822150773 +0100 +@@ -304,12 +304,16 @@ + seen.add(prefix) + + if os.sep == '/': ++ sitepackages.append(os.path.join(prefix, "lib64", ++ "python" + sys.version[:3], ++ "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], + "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-python")) + else: + sitepackages.append(prefix) ++ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-packages")) + if sys.platform == "darwin": + # for framework builds *only* we add the standard Apple +--- Python-3.4.0b1/Lib/sysconfig.py.lib64 2013-11-24 21:36:54.000000000 +0100 ++++ Python-3.4.0b1/Lib/sysconfig.py 2013-11-27 11:10:43.822150773 +0100 +@@ -20,10 +20,10 @@ + + _INSTALL_SCHEMES = { + 'posix_prefix': { +- 'stdlib': '{installed_base}/lib/python{py_version_short}', +- 'platstdlib': '{platbase}/lib/python{py_version_short}', ++ 'stdlib': '{installed_base}/lib64/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib64/python{py_version_short}', + 'purelib': '{base}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', + 'include': + '{installed_base}/include/python{py_version_short}{abiflags}', + 'platinclude': +@@ -61,10 +61,10 @@ + 'data': '{userbase}', + }, + 'posix_user': { +- 'stdlib': '{userbase}/lib/python{py_version_short}', +- 'platstdlib': '{userbase}/lib/python{py_version_short}', ++ 'stdlib': '{userbase}/lib64/python{py_version_short}', ++ 'platstdlib': '{userbase}/lib64/python{py_version_short}', + 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', + 'data': '{userbase}', +--- Python-3.4.0b1/Lib/test/test_site.py.lib64 2013-11-24 21:36:55.000000000 +0100 ++++ Python-3.4.0b1/Lib/test/test_site.py 2013-11-27 11:10:43.822150773 +0100 +@@ -244,12 +244,15 @@ + self.assertEqual(dirs[2], wanted) + elif os.sep == '/': + # OS X non-framwework builds, Linux, FreeBSD, etc +- self.assertEqual(len(dirs), 2) +- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], ++ self.assertEqual(len(dirs), 3) ++ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], + 'site-packages') + self.assertEqual(dirs[0], wanted) +- wanted = os.path.join('xoxo', 'lib', 'site-python') ++ wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], ++ 'site-packages') + self.assertEqual(dirs[1], wanted) ++ wanted = os.path.join('xoxo', 'lib', 'site-python') ++ self.assertEqual(dirs[2], wanted) + else: + # other platforms + self.assertEqual(len(dirs), 2) +--- Python-3.4.0b1/Makefile.pre.in.lib64 2013-11-27 11:10:43.814150786 +0100 ++++ Python-3.4.0b1/Makefile.pre.in 2013-11-27 11:10:43.823150771 +0100 +@@ -115,7 +115,7 @@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include +-SCRIPTDIR= $(prefix)/lib ++SCRIPTDIR= $(prefix)/lib64 + ABIFLAGS= @ABIFLAGS@ + + # Detailed destination directories +--- Python-3.4.0b1/Modules/getpath.c.lib64 2013-11-24 21:36:56.000000000 +0100 ++++ Python-3.4.0b1/Modules/getpath.c 2013-11-27 11:17:33.619449704 +0100 +@@ -122,8 +122,8 @@ + #endif + + #ifndef PYTHONPATH +-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ +- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ++#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ ++ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" + #endif + + #ifndef LANDMARK +@@ -498,7 +498,7 @@ + _pythonpath = _Py_char2wchar(PYTHONPATH, NULL); + _prefix = _Py_char2wchar(PREFIX, NULL); + _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL); +- lib_python = _Py_char2wchar("lib/python" VERSION, NULL); ++ lib_python = _Py_char2wchar("lib64/python" VERSION, NULL); + + if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { + Py_FatalError( +@@ -687,7 +687,7 @@ + } + else + wcsncpy(zip_path, _prefix, MAXPATHLEN); +- joinpath(zip_path, L"lib/python00.zip"); ++ joinpath(zip_path, L"lib64/python00.zip"); + bufsz = wcslen(zip_path); /* Replace "00" with version */ + zip_path[bufsz - 6] = VERSION[0]; + zip_path[bufsz - 5] = VERSION[2]; +@@ -699,7 +699,7 @@ + fprintf(stderr, + "Could not find platform dependent libraries <exec_prefix>\n"); + wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); +- joinpath(exec_prefix, L"lib/lib-dynload"); ++ joinpath(exec_prefix, L"lib64/lib-dynload"); + } + /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ + +--- Python-3.4.0b1/setup.py.lib64 2013-11-24 21:36:56.000000000 +0100 ++++ Python-3.4.0b1/setup.py 2013-11-27 11:10:43.824150769 +0100 +@@ -441,7 +441,7 @@ + # directories (i.e. '.' and 'Include') must be first. See issue + # 10520. + if not cross_compiling: +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + # only change this for cross builds for 3.3, issues on Mageia + if cross_compiling: +@@ -718,11 +718,11 @@ + elif curses_library: + readline_libs.append(curses_library) + elif self.compiler.find_library_file(lib_dirs + +- ['/usr/lib/termcap'], ++ ['/usr/lib64/termcap'], + 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], ++ library_dirs=['/usr/lib64/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs) ) + else: +@@ -759,8 +759,8 @@ + if krb5_h: + ssl_incs += krb5_h + ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, +- ['/usr/local/ssl/lib', +- '/usr/contrib/ssl/lib/' ++ ['/usr/local/ssl/lib64', ++ '/usr/contrib/ssl/lib64/' + ] ) + + if (ssl_incs is not None and diff --git a/python3/python3.nm b/python3/python3.nm index 51ddda9..e7394e0 100644 --- a/python3/python3.nm +++ b/python3/python3.nm @@ -4,8 +4,8 @@ ############################################################################### name = python3 -major_ver = 3.3 -version = %{major_ver}.0 +major_ver = 3.4 +version = %{major_ver}.3 release = 1 thisapp = Python-%{version} @@ -34,13 +34,13 @@ build automake bzip2 bzip2-devel - db4-devel >= 1:4.8 expat-devel >= 2.1.0 findutils gdbm-devel >= 1.10 gcc-c++ glibc-devel gmp-devel + libdb-devel libffi-devel libGL-devel libX11-devel @@ -62,9 +62,8 @@ build export LINKCC = gcc prepare_cmds - # Apply patches for x86_64. - if [ "$(uname -m)" = "x86_64" ]; then - patch -Np1 -i %{DIR_SOURCE}/python-3.3.0b1-lib64.patch + if [ "%{lib}" = "lib64" ]; then + patch -Np1 -i %{DIR_SOURCE}/python-3.4.3-lib64.patch fi # Remove embedded copies of expat and libffi @@ -83,11 +82,27 @@ build --with-dbmliborder=gdbm:ndbm:bdb \ --with-system-expat \ --with-system-ffi \ + --enable-loadable-sqlite-extensions \ --enable-shared - #test - # make test - #end + test + LD_LIBRARY_PATH=$(pwd) $(pwd)/python \ + -m test.regrtest \ + --verbose \ + --findleaks \ + -x test_distutils \ + -x test_faulthandler \ + -x test_gdb \ + -x test_email \ + -x test_subprocess \ + -x test_float \ + -x test_cmath \ + -x test_asynchat \ + -x test_asyncore + + # test_subprocess won't work on grsecurity-enabled kernels + # test_float and test_cmath do not work on armv5tel (soft FPU) + end install_cmds install -d -m 0755 %{BUILDROOT}%{pylibdir}/site-packages/__pycache__ diff --git a/xz/xz.nm b/xz/xz.nm index d7b042a..d27da32 100644 --- a/xz/xz.nm +++ b/xz/xz.nm @@ -4,48 +4,33 @@ ############################################################################### name = xz -version = 5.2.0 +version = 5.2.1 release = 1 -compat_version = 4.999.9beta - groups = Applications/Compression url = http://tukaani.org/xz/ license = LGPLv2+ summary = LZMA Utils. description - LZMA provides very high compression ratio and fast decompression. The \ - core of the LZMA utils is Igor Pavlov's LZMA SDK containing the actual \ - LZMA encoder/decoder. LZMA utils add a few scripts which provide \ - gzip-like command line interface and a couple of other LZMA related \ + LZMA provides very high compression ratio and fast decompression. The + core of the LZMA utils is Igor Pavlov's LZMA SDK containing the actual + LZMA encoder/decoder. LZMA utils add a few scripts which provide + gzip-like command line interface and a couple of other LZMA related tools. end source_dl = http://tukaani.org/xz/ -sources = %{thisapp}.tar.xz %{name}-%{compat_version}.tar.xz +sources = %{thisapp}.tar.xz build - configure_options += --disable-rpath - - build_cmds - # Build compat version of library. - cd %{DIR_SRC}/%{name}-%{compat_version} - ./configure %{configure_options} - %{MACRO_FIX_LIBTOOL} - make %{PARALLELISMFLAGS} - end + configure_options += \ + --disable-rpath test export LD_LIBRARY_PATH=$(pwd)/src/liblzma/.libs make check end - - install_cmds - # Install comapt version of library. - cd %{DIR_SRC}/%{name}-%{compat_version} - cp -vr src/liblzma/.libs/liblzma.so.0* %{BUILDROOT}%{libdir} - end end packages @@ -80,14 +65,6 @@ packages end end - package xz-compat-libs - summary = Compatibility version of %{name} (%{compat_version}). - - files - %{libdir}/lib*.so.0* - end - end - package %{name}-debuginfo template DEBUGINFO end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. abf738371c25cfcf754e7d30e8f645ce8377ba7b
by git＠ipfire.org 21 Jun '15

21 Jun '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1f02b6e0e15f06284d865247a06457acbb98c1a0
by git＠ipfire.org 20 Jun '15

20 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 1f02b6e0e15f06284d865247a06457acbb98c1a0 (commit) from 3a9a74d83925f91ecdafc79338fb79eb4efd5b29 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1f02b6e0e15f06284d865247a06457acbb98c1a0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 20 21:39:45 2015 +0200 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/python | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) Difference in files: diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python index 4f11c56..6542f0d 100644 --- a/config/rootfiles/common/python +++ b/config/rootfiles/common/python @@ -494,9 +494,6 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc #usr/lib/python2.7/ctypes/test/test_delattr.py #usr/lib/python2.7/ctypes/test/test_delattr.pyc #usr/lib/python2.7/ctypes/test/test_delattr.pyo -#usr/lib/python2.7/ctypes/test/test_errcheck.py -#usr/lib/python2.7/ctypes/test/test_errcheck.pyc -#usr/lib/python2.7/ctypes/test/test_errcheck.pyo #usr/lib/python2.7/ctypes/test/test_errno.py #usr/lib/python2.7/ctypes/test/test_errno.pyc #usr/lib/python2.7/ctypes/test/test_errno.pyo @@ -518,9 +515,6 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc #usr/lib/python2.7/ctypes/test/test_init.py #usr/lib/python2.7/ctypes/test/test_init.pyc #usr/lib/python2.7/ctypes/test/test_init.pyo -#usr/lib/python2.7/ctypes/test/test_integers.py -#usr/lib/python2.7/ctypes/test/test_integers.pyc -#usr/lib/python2.7/ctypes/test/test_integers.pyo #usr/lib/python2.7/ctypes/test/test_internals.py #usr/lib/python2.7/ctypes/test/test_internals.pyc #usr/lib/python2.7/ctypes/test/test_internals.pyo @@ -1469,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1774,6 +1768,9 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/idle_test/test_idlehistory.py #usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyc #usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyo +#usr/lib/python2.7/idlelib/idle_test/test_io.py +#usr/lib/python2.7/idlelib/idle_test/test_io.pyc +#usr/lib/python2.7/idlelib/idle_test/test_io.pyo #usr/lib/python2.7/idlelib/idle_test/test_parenmatch.py #usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyc #usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyo @@ -1819,9 +1816,6 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/tabbedpages.py #usr/lib/python2.7/idlelib/tabbedpages.pyc #usr/lib/python2.7/idlelib/tabbedpages.pyo -#usr/lib/python2.7/idlelib/testcode.py -#usr/lib/python2.7/idlelib/testcode.pyc -#usr/lib/python2.7/idlelib/testcode.pyo #usr/lib/python2.7/idlelib/textView.py #usr/lib/python2.7/idlelib/textView.pyc #usr/lib/python2.7/idlelib/textView.pyo @@ -1922,7 +1916,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -usr/lib/python2.7/lib-dynload/Python-2.7.9-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -2098,9 +2092,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.9.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.9.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2981,7 +2975,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest #usr/lib/python2.7/test/decimaltestdata/xor.decTest -#usr/lib/python2.7/test/dh512.pem +#usr/lib/python2.7/test/dh1024.pem #usr/lib/python2.7/test/doctest_aliases.py #usr/lib/python2.7/test/doctest_aliases.pyc #usr/lib/python2.7/test/doctest_aliases.pyo @@ -4167,6 +4161,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_time.py #usr/lib/python2.7/test/test_time.pyc #usr/lib/python2.7/test/test_time.pyo +#usr/lib/python2.7/test/test_timeit.py +#usr/lib/python2.7/test/test_timeit.pyc +#usr/lib/python2.7/test/test_timeit.pyo #usr/lib/python2.7/test/test_timeout.py #usr/lib/python2.7/test/test_timeout.pyc #usr/lib/python2.7/test/test_timeout.pyo hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3a9a74d83925f91ecdafc79338fb79eb4efd5b29
by git＠ipfire.org 18 Jun '15

18 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 3a9a74d83925f91ecdafc79338fb79eb4efd5b29 (commit) from 8801fc5f95672cf828d15f700c88454a97d1ca9e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3a9a74d83925f91ecdafc79338fb79eb4efd5b29 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 18 21:22:51 2015 +0200 python: Cleanup patches I accidentially added a wrong patch and left in a reference to a removed one. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/python | 1 - src/patches/python-2.7rc1-ctypes-noexecmem.patch | 85 ------------------------ 2 files changed, 86 deletions(-) delete mode 100644 src/patches/python-2.7rc1-ctypes-noexecmem.patch Difference in files: diff --git a/lfs/python b/lfs/python index 22613e6..013f9c1 100644 --- a/lfs/python +++ b/lfs/python @@ -71,7 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \ --prefix=/usr --enable-shared --with-system-ffi cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/python-2.7rc1-ctypes-noexecmem.patch b/src/patches/python-2.7rc1-ctypes-noexecmem.patch deleted file mode 100644 index ccc2e68..0000000 --- a/src/patches/python-2.7rc1-ctypes-noexecmem.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -up Python-2.7rc1/Modules/_ctypes/callbacks.c.selinux Python-2.7rc1/Modules/_ctypes/callbacks.c ---- Python-2.7rc1/Modules/_ctypes/callbacks.c.selinux 2010-05-09 10:46:46.000000000 -0400 -+++ Python-2.7rc1/Modules/_ctypes/callbacks.c 2010-06-08 08:44:18.357366200 -0400 -@@ -21,8 +21,8 @@ CThunkObject_dealloc(PyObject *_self) - Py_XDECREF(self->converters); - Py_XDECREF(self->callable); - Py_XDECREF(self->restype); -- if (self->pcl) -- _ctypes_free_closure(self->pcl); -+ if (self->pcl_write) -+ ffi_closure_free(self->pcl_write); - PyObject_GC_Del(self); - } - -@@ -391,7 +391,8 @@ static CThunkObject* CThunkObject_new(Py - return NULL; - } - -- p->pcl = NULL; -+ p->pcl_exec = NULL; -+ p->pcl_write = NULL; - memset(&p->cif, 0, sizeof(p->cif)); - p->converters = NULL; - p->callable = NULL; -@@ -421,8 +422,9 @@ CThunkObject *_ctypes_alloc_callback(PyO - - assert(CThunk_CheckExact(p)); - -- p->pcl = _ctypes_alloc_closure(); -- if (p->pcl == NULL) { -+ p->pcl_write = ffi_closure_alloc(sizeof(ffi_closure), -+ &p->pcl_exec); -+ if (p->pcl_write == NULL) { - PyErr_NoMemory(); - goto error; - } -@@ -467,7 +469,9 @@ CThunkObject *_ctypes_alloc_callback(PyO - "ffi_prep_cif failed with %d", result); - goto error; - } -- result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); -+ result = ffi_prep_closure_loc(p->pcl_write, &p->cif, closure_fcn, -+ p, -+ p->pcl_exec); - if (result != FFI_OK) { - PyErr_Format(PyExc_RuntimeError, - "ffi_prep_closure failed with %d", result); -diff -up Python-2.7rc1/Modules/_ctypes/_ctypes.c.selinux Python-2.7rc1/Modules/_ctypes/_ctypes.c ---- Python-2.7rc1/Modules/_ctypes/_ctypes.c.selinux 2010-05-09 10:46:46.000000000 -0400 -+++ Python-2.7rc1/Modules/_ctypes/_ctypes.c 2010-06-07 23:19:39.950146038 -0400 -@@ -3463,7 +3463,7 @@ PyCFuncPtr_new(PyTypeObject *type, PyObj - self->callable = callable; - - self->thunk = thunk; -- *(void **)self->b_ptr = (void *)thunk->pcl; -+ *(void **)self->b_ptr = (void *)thunk->pcl_exec; - - Py_INCREF((PyObject *)thunk); /* for KeepRef */ - if (-1 == KeepRef((CDataObject *)self, 0, (PyObject *)thunk)) { -diff -up Python-2.7rc1/Modules/_ctypes/ctypes.h.selinux Python-2.7rc1/Modules/_ctypes/ctypes.h ---- Python-2.7rc1/Modules/_ctypes/ctypes.h.selinux 2010-05-09 10:46:46.000000000 -0400 -+++ Python-2.7rc1/Modules/_ctypes/ctypes.h 2010-06-07 23:19:39.950146038 -0400 -@@ -95,7 +95,8 @@ struct tagCDataObject { - - typedef struct { - PyObject_VAR_HEAD -- ffi_closure *pcl; /* the C callable */ -+ ffi_closure *pcl_write; /* the C callable, writeable */ -+ void *pcl_exec; /* the C callable, executable */ - ffi_cif cif; - int flags; - PyObject *converters; -diff -up Python-2.7rc1/setup.py.selinux Python-2.7rc1/setup.py ---- Python-2.7rc1/setup.py.selinux 2010-06-07 23:19:39.922147795 -0400 -+++ Python-2.7rc1/setup.py 2010-06-07 23:19:39.951145942 -0400 -@@ -1864,8 +1864,7 @@ class PyBuildExt(build_ext): - '_ctypes/callbacks.c', - '_ctypes/callproc.c', - '_ctypes/stgdict.c', -- '_ctypes/cfield.c', -- '_ctypes/malloc_closure.c'] -+ '_ctypes/cfield.c'] - depends = ['_ctypes/ctypes.h'] - - if sys.platform == 'darwin': hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8801fc5f95672cf828d15f700c88454a97d1ca9e
by git＠ipfire.org 18 Jun '15

18 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 8801fc5f95672cf828d15f700c88454a97d1ca9e (commit) from bbdc2e4bcf64a96d3ddd3ae42cbe49341c1a4f59 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8801fc5f95672cf828d15f700c88454a97d1ca9e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 18 21:17:14 2015 +0200 core92: The Python update belongs into Core Update 92 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/91/filelists/python | 1 - 1 file changed, 1 deletion(-) delete mode 120000 config/rootfiles/core/91/filelists/python Difference in files: diff --git a/config/rootfiles/core/91/filelists/python b/config/rootfiles/core/91/filelists/python deleted file mode 120000 index ffe6e2c..0000000 --- a/config/rootfiles/core/91/filelists/python +++ /dev/null @@ -1 +0,0 @@ -../../../common/python \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2015