Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 441828

Summary: net-dialup/xl2tpd - patch to add 2.6.35+ kernel mode support
Product: Gentoo Linux Reporter: nE0sIghT <ykonotopov>
Component: Current packagesAssignee: Gentoo Dialup Developers <net-dialup>
Status: RESOLVED FIXED    
Severity: normal CC: floppym
Priority: Normal Keywords: EBUILD, PATCH
Version: unspecified   
Hardware: All   
OS: Linux   
Whiteboard:
Package list:
Runtime testing required: ---
Attachments: xl2tpd-1.3.1.ebuild with kernel use flag
xl2tpd-1.3.0-kernelmode.patch - kernel support patch used by Fedora
xl2tpd-1.3.1-kernel_in6.patch

Description nE0sIghT 2012-11-05 07:49:55 UTC
Created attachment 328412 [details]
xl2tpd-1.3.1.ebuild with kernel use flag

There is description of problem in Fedora bug: https://bugzilla.redhat.com/show_bug.cgi?id=670195
Comment 1 nE0sIghT 2012-11-05 07:51:31 UTC
Created attachment 328414 [details, diff]
xl2tpd-1.3.0-kernelmode.patch - kernel support patch used by Fedora
Comment 2 nE0sIghT 2012-11-05 07:54:45 UTC
Created attachment 328416 [details]
xl2tpd-1.3.1-kernel_in6.patch

This patch adds 2 additional structs to linux/include/linux/if_pppol2tp.h
Without it xl2tpd with Fedora's kernel patch doesn't compliles on my system

emerge --info
Portage 2.2.0_alpha142 (default/linux/amd64/10.0, gcc-4.7.2, glibc-2.15-r3, 3.6.5-gentoo x86_64)
=================================================================
System uname: Linux-3.6.5-gentoo-x86_64-Intel-R-_Core-TM-_i5-2400_CPU_@_3.10GHz-with-gentoo-2.1
Timestamp of tree: Sun, 04 Nov 2012 17:45:01 +0000
ld GNU ld (GNU Binutils) 2.22
ccache version 3.1.8 [enabled]
app-shells/bash:          4.2_p37
dev-java/java-config:     2.1.11-r3
dev-lang/python:          2.7.3-r2, 3.2.3
dev-util/ccache:          3.1.8
dev-util/cmake:           2.8.9-r1
dev-util/pkgconfig:       0.27.1
sys-apps/baselayout:      2.1-r1
sys-apps/openrc:          0.11.2
sys-apps/sandbox:         2.6
sys-devel/autoconf:       2.13, 2.68
sys-devel/automake:       1.11.6
sys-devel/binutils:       2.22-r1
sys-devel/gcc:            4.7.2
sys-devel/gcc-config:     1.7.3
sys-devel/libtool:        2.4-r1
sys-devel/make:           3.82-r4
sys-kernel/linux-headers: 3.6 (virtual/os-headers)
sys-libs/glibc:           2.15-r3
Repositories: gentoo vortex roslin qutim gamerlay gnome
ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe -O2 -march=native -pipe -fomit-frame-pointer -g0 -ftree-vectorize -floop-interchange -floop-strip-mine -floop-block -ftree-loop-distribution"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt /var/lib/hsqldb"
CONFIG_PROTECT_MASK="${EPREFIX}/etc/gconf /etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5.4/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O2 -pipe -O2 -march=native -pipe -fomit-frame-pointer -g0 -ftree-vectorize -floop-interchange -floop-strip-mine -floop-block -ftree-loop-distribution"
DISTDIR="/usr/portage/distfiles"
EMERGE_DEFAULT_OPTS="--quiet-build=n"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs ccache config-protect-if-modified distlocks ebuild-locks fail-clean fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch xattr"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
LANG="ru_RU.utf8"
LC_ALL=""
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="ru ru_RU en"
MAKEOPTS="-j5"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage/vortex /var/lib/layman/roslin /var/lib/layman/qutim /var/lib/layman/gamerlay /var/lib/layman/gnome"
SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage"
USE="7zip X a-like-o a52 aac aacplus aalib acl acpi adns alsa amd64 apng applet archive artworkextra audacious audio audiofile automount avx bazaar berkdb bittorrent bittorrent-external branding bsf bzip2 cairo caps cdr cdrtools chardet chdir cjk cli collada consolekit cover cracklib crypt css cuda cue cups cupsddk curl custom-optimization cvs cxx dbus device-mapper dga dhcp dht diff dirac directfb disk-partition divx djvu dnsretry dri dv dvd dvdr eap-tls enca encode exif extensions extras facedetect fat ffmpeg fftw fileinfo firefox flac fluidsynth fontconfig fortran frei0r fts3 fuse g3dvl gd gdbm gdu geoip gif glade glib glitz gnome gnome-keyring gphoto2 gpm graphite grp grub gstreamer gtk gtk3 gtkstyle gzip hddtemp hog hvm hwdb iconsets iconv icq id3tag idle idn inifile intl introspection ioemu ipv6 jabber java java6 javascript jingle joystick jpeg jpeg2k kate keymap kvm ladspa lame lcms libass libcaca libkms libnotify libsamplerate libtiger lights lm_sensors loop-aes lucene lyrics lzma lzo mad matroska melt mercurial minizip mmx mmxext mng modules mp2 mp3 mp4 mp4live mpeg mpeg2 mpg123 mpi mplayer mpu401 mtp mudflap multilib musepack mvl mysql mysqli nautilus ncurses netplay network nls nptl nsplugin nss ntfs ntfsprogs nvidia offensive ofx ogg ogm oodict openal opencl opencore-amr opengl openmp openssl opensslcrypt optimization optimized-qmake pam parse-clocks pcf pch pcre pcre16 pdo pgo php player plugins png policykit ppds pppd projectm psf pulseaudio qpak qt4 quicktime rar readline realmedia resolvconf romio rtsp ru-dv ru-g ru-i ru-k sasl scale0tilt screen screenshot sdl secure-delete session skins slp smp sndfile sound sounds speex spell sqlite sqlite3 sse sse2 sse3 sse4 ssl ssse3 stream strong-optimization subtitles subversion svg t1lib taglib tcpd textures theora threads thunderbird tiff timidity tint2conf tk tls toolbar trayicon truetype tta tweak-mode twolame udev udisks unicode unzip usb v4l2 vaapi vala vamp vdpau verse vorbis vorbis-psy vpx wad wav wavpack webkit whiteboarding winbind wma wmp x264 xanim xattr xcb xcomposite xhtml xinetd xml xmlreader xmlrpc xmlwriter xorg xosd xpm xsl xulrunner xv xvfb xvid zip zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CURL_SSL="nss" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" GRUB_PLATFORMS="pc efi-64" INPUT_DEVICES="evdev joystick" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LINGUAS="ru ru_RU en" LIRC_DEVICES="devinput" NETBEANS_MODULES="apisupport harness ide java nb websvccommon php" PHP_TARGETS="php5-4" PYTHON_TARGETS="python3_2 python2_7" RUBY_TARGETS="ruby18 ruby19" USERLAND="GNU" VIDEO_CARDS="nvidia" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CPPFLAGS, CTARGET, INSTALL_MASK, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, USE_PYTHON
Comment 3 Jeroen Roovers (RETIRED) gentoo-dev 2012-11-05 12:10:11 UTC
Comment on attachment 328412 [details]
xl2tpd-1.3.1.ebuild with kernel use flag

--- xl2tpd-1.3.1.ebuild 2012-09-18 17:57:28.000000000 +0200
+++ -   2012-11-05 13:10:03.049599873 +0100
@@ -13,7 +13,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dnsretry"
+IUSE="dnsretry kernel"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}
@@ -27,6 +27,9 @@
        # The below patch is questionable. Why wasn't it submitted upstream? If it
        # ever breaks, it will just be removed. -darkside 20120914
        use dnsretry && epatch "${FILESDIR}/${PN}-dnsretry.patch"
+       use kernel && \
+           epatch "${FILESDIR}"/xl2tpd-1.3.0-kernelmode.patch && \
+           epatch "${FILESDIR}"/xl2tpd-1.3.1-kernel_in6.patch
 }
 
 src_compile() {
Comment 4 Mike Gilbert gentoo-dev 2012-12-26 04:15:35 UTC
Should be working in xl2tpd-1.3.1-r2.