]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 13 Nov 2012 17:29:13 +0000 (18:29 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 13 Nov 2012 17:29:13 +0000 (18:29 +0100)
15 files changed:
config/include/obsolete_videodev.h [new file with mode: 0644]
config/rootfiles/common/i586/glibc
config/rootfiles/common/i586/initscripts
config/rootfiles/common/i586/linux-headers [moved from config/rootfiles/common/i586/linux2 with 90% similarity]
config/rootfiles/common/iptables
config/rootfiles/packages/w_scan
lfs/compat-wireless
lfs/initscripts
lfs/linux
lfs/motion
lfs/vdr
lfs/w_scan
make.sh
src/initscripts/init.d/sendsignals
src/patches/w_scan-ipfire.patch [deleted file]

diff --git a/config/include/obsolete_videodev.h b/config/include/obsolete_videodev.h
new file mode 100644 (file)
index 0000000..c51a5f9
--- /dev/null
@@ -0,0 +1,320 @@
+/*
+ *     Video for Linux version 1 - OBSOLETE
+ *
+ *     Header file for v4l1 drivers and applications, for
+ *     Linux kernels 2.2.x or 2.4.x.
+ *
+ *     Provides header for legacy drivers and applications
+ *
+ *     See http://linuxtv.org for more info
+ *
+ */
+#ifndef __LINUX_VIDEODEV_H
+#define __LINUX_VIDEODEV_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <linux/videodev2.h>
+
+
+#define VID_TYPE_CAPTURE       1       /* Can capture */
+#define VID_TYPE_TUNER         2       /* Can tune */
+#define VID_TYPE_TELETEXT      4       /* Does teletext */
+#define VID_TYPE_OVERLAY       8       /* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY     16      /* Overlay by chromakey */
+#define VID_TYPE_CLIPPING      32      /* Can clip */
+#define VID_TYPE_FRAMERAM      64      /* Uses the frame buffer memory */
+#define VID_TYPE_SCALES                128     /* Scalable */
+#define VID_TYPE_MONOCHROME    256     /* Monochrome only */
+#define VID_TYPE_SUBCAPTURE    512     /* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER  1024    /* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER  2048    /* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER 4096    /* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER 8192    /* Can encode MJPEG streams */
+
+struct video_capability
+{
+       char name[32];
+       int type;
+       int channels;   /* Num channels */
+       int audios;     /* Num audio devices */
+       int maxwidth;   /* Supported width */
+       int maxheight;  /* And height */
+       int minwidth;   /* Supported width */
+       int minheight;  /* And height */
+};
+
+
+struct video_channel
+{
+       int channel;
+       char name[32];
+       int tuners;
+       __u32  flags;
+#define VIDEO_VC_TUNER         1       /* Channel has a tuner */
+#define VIDEO_VC_AUDIO         2       /* Channel has audio */
+       __u16  type;
+#define VIDEO_TYPE_TV          1
+#define VIDEO_TYPE_CAMERA      2
+       __u16 norm;                     /* Norm set by channel */
+};
+
+struct video_tuner
+{
+       int tuner;
+       char name[32];
+       unsigned long rangelow, rangehigh;      /* Tuner range */
+       __u32 flags;
+#define VIDEO_TUNER_PAL                1
+#define VIDEO_TUNER_NTSC       2
+#define VIDEO_TUNER_SECAM      4
+#define VIDEO_TUNER_LOW                8       /* Uses KHz not MHz */
+#define VIDEO_TUNER_NORM       16      /* Tuner can set norm */
+#define VIDEO_TUNER_STEREO_ON  128     /* Tuner is seeing stereo */
+#define VIDEO_TUNER_RDS_ON      256     /* Tuner is seeing an RDS datastream */
+#define VIDEO_TUNER_MBS_ON      512     /* Tuner is seeing an MBS datastream */
+       __u16 mode;                     /* PAL/NTSC/SECAM/OTHER */
+#define VIDEO_MODE_PAL         0
+#define VIDEO_MODE_NTSC                1
+#define VIDEO_MODE_SECAM       2
+#define VIDEO_MODE_AUTO                3
+       __u16 signal;                   /* Signal strength 16bit scale */
+};
+
+struct video_picture
+{
+       __u16   brightness;
+       __u16   hue;
+       __u16   colour;
+       __u16   contrast;
+       __u16   whiteness;      /* Black and white only */
+       __u16   depth;          /* Capture depth */
+       __u16   palette;        /* Palette in use */
+#define VIDEO_PALETTE_GREY     1       /* Linear greyscale */
+#define VIDEO_PALETTE_HI240    2       /* High 240 cube (BT848) */
+#define VIDEO_PALETTE_RGB565   3       /* 565 16 bit RGB */
+#define VIDEO_PALETTE_RGB24    4       /* 24bit RGB */
+#define VIDEO_PALETTE_RGB32    5       /* 32bit RGB */
+#define VIDEO_PALETTE_RGB555   6       /* 555 15bit RGB */
+#define VIDEO_PALETTE_YUV422   7       /* YUV422 capture */
+#define VIDEO_PALETTE_YUYV     8
+#define VIDEO_PALETTE_UYVY     9       /* The great thing about standards is ... */
+#define VIDEO_PALETTE_YUV420   10
+#define VIDEO_PALETTE_YUV411   11      /* YUV411 capture */
+#define VIDEO_PALETTE_RAW      12      /* RAW capture (BT848) */
+#define VIDEO_PALETTE_YUV422P  13      /* YUV 4:2:2 Planar */
+#define VIDEO_PALETTE_YUV411P  14      /* YUV 4:1:1 Planar */
+#define VIDEO_PALETTE_YUV420P  15      /* YUV 4:2:0 Planar */
+#define VIDEO_PALETTE_YUV410P  16      /* YUV 4:1:0 Planar */
+#define VIDEO_PALETTE_PLANAR   13      /* start of planar entries */
+#define VIDEO_PALETTE_COMPONENT 7      /* start of component entries */
+};
+
+struct video_audio
+{
+       int     audio;          /* Audio channel */
+       __u16   volume;         /* If settable */
+       __u16   bass, treble;
+       __u32   flags;
+#define VIDEO_AUDIO_MUTE       1
+#define VIDEO_AUDIO_MUTABLE    2
+#define VIDEO_AUDIO_VOLUME     4
+#define VIDEO_AUDIO_BASS       8
+#define VIDEO_AUDIO_TREBLE     16
+#define VIDEO_AUDIO_BALANCE    32
+       char    name[16];
+#define VIDEO_SOUND_MONO       1
+#define VIDEO_SOUND_STEREO     2
+#define VIDEO_SOUND_LANG1      4
+#define VIDEO_SOUND_LANG2      8
+       __u16   mode;
+       __u16   balance;        /* Stereo balance */
+       __u16   step;           /* Step actual volume uses */
+};
+
+struct video_clip
+{
+       __s32   x,y;
+       __s32   width, height;
+       struct  video_clip *next;       /* For user use/driver use only */
+};
+
+struct video_window
+{
+       __u32   x,y;                    /* Position of window */
+       __u32   width,height;           /* Its size */
+       __u32   chromakey;
+       __u32   flags;
+       struct  video_clip *clips;      /* Set only */
+       int     clipcount;
+#define VIDEO_WINDOW_INTERLACE 1
+#define VIDEO_WINDOW_CHROMAKEY 16      /* Overlay by chromakey */
+#define VIDEO_CLIP_BITMAP      -1
+/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
+#define VIDEO_CLIPMAP_SIZE     (128 * 625)
+};
+
+struct video_capture
+{
+       __u32   x,y;                    /* Offsets into image */
+       __u32   width, height;          /* Area to capture */
+       __u16   decimation;             /* Decimation divider */
+       __u16   flags;                  /* Flags for capture */
+#define VIDEO_CAPTURE_ODD              0       /* Temporal */
+#define VIDEO_CAPTURE_EVEN             1
+};
+
+struct video_buffer
+{
+       void    *base;
+       int     height,width;
+       int     depth;
+       int     bytesperline;
+};
+
+struct video_mmap
+{
+       unsigned        int frame;              /* Frame (0 - n) for double buffer */
+       int             height,width;
+       unsigned        int format;             /* should be VIDEO_PALETTE_* */
+};
+
+struct video_key
+{
+       __u8    key[8];
+       __u32   flags;
+};
+
+struct video_mbuf
+{
+       int     size;           /* Total memory to map */
+       int     frames;         /* Frames */
+       int     offsets[VIDEO_MAX_FRAME];
+};
+
+#define        VIDEO_NO_UNIT   (-1)
+
+struct video_unit
+{
+       int     video;          /* Video minor */
+       int     vbi;            /* VBI minor */
+       int     radio;          /* Radio minor */
+       int     audio;          /* Audio minor */
+       int     teletext;       /* Teletext minor */
+};
+
+struct vbi_format {
+       __u32   sampling_rate;  /* in Hz */
+       __u32   samples_per_line;
+       __u32   sample_format;  /* VIDEO_PALETTE_RAW only (1 byte) */
+       __s32   start[2];       /* starting line for each frame */
+       __u32   count[2];       /* count of lines for each frame */
+       __u32   flags;
+#define        VBI_UNSYNC      1       /* can distingues between top/bottom field */
+#define        VBI_INTERLACED  2       /* lines are interlaced */
+};
+
+/* video_info is biased towards hardware mpeg encode/decode */
+/* but it could apply generically to any hardware compressor/decompressor */
+struct video_info
+{
+       __u32   frame_count;    /* frames output since decode/encode began */
+       __u32   h_size;         /* current unscaled horizontal size */
+       __u32   v_size;         /* current unscaled veritcal size */
+       __u32   smpte_timecode; /* current SMPTE timecode (for current GOP) */
+       __u32   picture_type;   /* current picture type */
+       __u32   temporal_reference;     /* current temporal reference */
+       __u8    user_data[256]; /* user data last found in compressed stream */
+       /* user_data[0] contains user data flags, user_data[1] has count */
+};
+
+/* generic structure for setting playback modes */
+struct video_play_mode
+{
+       int     mode;
+       int     p1;
+       int     p2;
+};
+
+/* for loading microcode / fpga programming */
+struct video_code
+{
+       char    loadwhat[16];   /* name or tag of file being passed */
+       int     datasize;
+       __u8    *data;
+};
+
+#define VIDIOCGCAP             _IOR('v',1,struct video_capability)     /* Get capabilities */
+#define VIDIOCGCHAN            _IOWR('v',2,struct video_channel)       /* Get channel info (sources) */
+#define VIDIOCSCHAN            _IOW('v',3,struct video_channel)        /* Set channel  */
+#define VIDIOCGTUNER           _IOWR('v',4,struct video_tuner)         /* Get tuner abilities */
+#define VIDIOCSTUNER           _IOW('v',5,struct video_tuner)          /* Tune the tuner for the current channel */
+#define VIDIOCGPICT            _IOR('v',6,struct video_picture)        /* Get picture properties */
+#define VIDIOCSPICT            _IOW('v',7,struct video_picture)        /* Set picture properties */
+#define VIDIOCCAPTURE          _IOW('v',8,int)                         /* Start, end capture */
+#define VIDIOCGWIN             _IOR('v',9, struct video_window)        /* Get the video overlay window */
+#define VIDIOCSWIN             _IOW('v',10, struct video_window)       /* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
+#define VIDIOCGFBUF            _IOR('v',11, struct video_buffer)       /* Get frame buffer */
+#define VIDIOCSFBUF            _IOW('v',12, struct video_buffer)       /* Set frame buffer - root only */
+#define VIDIOCKEY              _IOR('v',13, struct video_key)          /* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
+#define VIDIOCGFREQ            _IOR('v',14, unsigned long)             /* Set tuner */
+#define VIDIOCSFREQ            _IOW('v',15, unsigned long)             /* Set tuner */
+#define VIDIOCGAUDIO           _IOR('v',16, struct video_audio)        /* Get audio info */
+#define VIDIOCSAUDIO           _IOW('v',17, struct video_audio)        /* Audio source, mute etc */
+#define VIDIOCSYNC             _IOW('v',18, int)                       /* Sync with mmap grabbing */
+#define VIDIOCMCAPTURE         _IOW('v',19, struct video_mmap)         /* Grab frames */
+#define VIDIOCGMBUF            _IOR('v',20, struct video_mbuf)         /* Memory map buffer info */
+#define VIDIOCGUNIT            _IOR('v',21, struct video_unit)         /* Get attached units */
+#define VIDIOCGCAPTURE         _IOR('v',22, struct video_capture)      /* Get subcapture */
+#define VIDIOCSCAPTURE         _IOW('v',23, struct video_capture)      /* Set subcapture */
+#define VIDIOCSPLAYMODE                _IOW('v',24, struct video_play_mode)    /* Set output video mode/feature */
+#define VIDIOCSWRITEMODE       _IOW('v',25, int)                       /* Set write mode */
+#define VIDIOCGPLAYINFO                _IOR('v',26, struct video_info)         /* Get current playback info from hardware */
+#define VIDIOCSMICROCODE       _IOW('v',27, struct video_code)         /* Load microcode into hardware */
+#define        VIDIOCGVBIFMT           _IOR('v',28, struct vbi_format)         /* Get VBI information */
+#define        VIDIOCSVBIFMT           _IOW('v',29, struct vbi_format)         /* Set VBI information */
+
+
+#define BASE_VIDIOCPRIVATE     192             /* 192-255 are private */
+
+/* VIDIOCSWRITEMODE */
+#define VID_WRITE_MPEG_AUD             0
+#define VID_WRITE_MPEG_VID             1
+#define VID_WRITE_OSD                  2
+#define VID_WRITE_TTX                  3
+#define VID_WRITE_CC                   4
+#define VID_WRITE_MJPEG                        5
+
+/* VIDIOCSPLAYMODE */
+#define VID_PLAY_VID_OUT_MODE          0
+       /* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */
+#define VID_PLAY_GENLOCK               1
+       /* p1: 0 = OFF, 1 = ON */
+       /* p2: GENLOCK FINE DELAY value */
+#define VID_PLAY_NORMAL                        2
+#define VID_PLAY_PAUSE                 3
+#define VID_PLAY_SINGLE_FRAME          4
+#define VID_PLAY_FAST_FORWARD          5
+#define VID_PLAY_SLOW_MOTION           6
+#define VID_PLAY_IMMEDIATE_NORMAL      7
+#define VID_PLAY_SWITCH_CHANNELS       8
+#define VID_PLAY_FREEZE_FRAME          9
+#define VID_PLAY_STILL_MODE            10
+#define VID_PLAY_MASTER_MODE           11
+       /* p1: see below */
+#define                VID_PLAY_MASTER_NONE    1
+#define                VID_PLAY_MASTER_VIDEO   2
+#define                VID_PLAY_MASTER_AUDIO   3
+#define VID_PLAY_ACTIVE_SCANLINES      12
+       /* p1 = first active; p2 = last active */
+#define VID_PLAY_RESET                 13
+#define VID_PLAY_END_MARK              14
+
+
+#endif /* __LINUX_VIDEODEV_H */
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
index 129475fd0ca0ca68bc147e2fd020de63fd64b273..ca62948a3ac8841330f6d8a2298a785b870d1e23 100644 (file)
@@ -354,6 +354,7 @@ usr/bin/ldd
 #usr/include/rpcsvc/yppasswd.x
 #usr/include/rpcsvc/ypupd.h
 #usr/include/sched.h
+#usr/include/scsi/scsi.h
 #usr/include/scsi/scsi_ioctl.h
 #usr/include/scsi/sg.h
 #usr/include/search.h
index 8092a162d3824e53acae40f15432b07861a5aed7..5bc93d7ed5d46486f75808cf062d3136952a49a7 100644 (file)
@@ -151,6 +151,7 @@ etc/rc.d/rc0.d/K80network
 #etc/rc.d/rc0.d/K84bluetooth
 #etc/rc.d/rc0.d/K85messagebus
 etc/rc.d/rc0.d/K85tmpfs
+etc/rc.d/rc0.d/K87acpid
 etc/rc.d/rc0.d/K90sysklogd
 etc/rc.d/rc0.d/S60sendsignals
 etc/rc.d/rc0.d/S70localnet
@@ -160,6 +161,7 @@ etc/rc.d/rc0.d/S99halt
 #etc/rc.d/rc3.d
 etc/rc.d/rc3.d/S01tmpfs
 etc/rc.d/rc3.d/S10sysklogd
+etc/rc.d/rc3.d/S12acpid
 #etc/rc.d/rc3.d/S15messagebus
 #etc/rc.d/rc3.d/S16bluetooth
 #etc/rc.d/rc3.d/S18cpufreq
@@ -197,6 +199,7 @@ etc/rc.d/rc6.d/K80network
 #etc/rc.d/rc6.d/K84bluetooth
 #etc/rc.d/rc6.d/K85messagebus
 etc/rc.d/rc6.d/K85tmpfs
+etc/rc.d/rc6.d/K87acpid
 etc/rc.d/rc6.d/K90sysklogd
 etc/rc.d/rc6.d/S60sendsignals
 etc/rc.d/rc6.d/S70mountfs
@@ -214,7 +217,6 @@ etc/rc.d/rcsysinit.d/S30checkfs
 etc/rc.d/rcsysinit.d/S40mountfs
 etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
-etc/rc.d/rcsysinit.d/S51acpid
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S75firstsetup
similarity index 90%
rename from config/rootfiles/common/i586/linux2
rename to config/rootfiles/common/i586/linux-headers
index dac70a6d2ba21d65ea480f516ceec9d60de8ea03..e518ab3df559f98581244b2313af7f6d22fc95fb 100644 (file)
@@ -44,6 +44,8 @@
 #usr/include/asm/e820.h
 #usr/include/asm/errno.h
 #usr/include/asm/fcntl.h
+#usr/include/asm/hw_breakpoint.h
+#usr/include/asm/hyperv.h
 #usr/include/asm/ioctl.h
 #usr/include/asm/ioctls.h
 #usr/include/asm/ipcbuf.h
 #usr/include/drm/drm_mode.h
 #usr/include/drm/drm_sarea.h
 #usr/include/drm/i810_drm.h
-#usr/include/drm/i830_drm.h
 #usr/include/drm/i915_drm.h
 #usr/include/drm/mga_drm.h
+#usr/include/drm/nouveau_drm.h
 #usr/include/drm/r128_drm.h
 #usr/include/drm/radeon_drm.h
 #usr/include/drm/savage_drm.h
 #usr/include/drm/sis_drm.h
 #usr/include/drm/via_drm.h
+#usr/include/drm/vmwgfx_drm.h
 #usr/include/linux
 #usr/include/linux/a.out.h
 #usr/include/linux/acct.h
 #usr/include/linux/baycom.h
 #usr/include/linux/bfs_fs.h
 #usr/include/linux/binfmts.h
+#usr/include/linux/blk_types.h
 #usr/include/linux/blkpg.h
 #usr/include/linux/blktrace_api.h
 #usr/include/linux/bpqether.h
 #usr/include/linux/byteorder
 #usr/include/linux/byteorder/big_endian.h
 #usr/include/linux/byteorder/little_endian.h
+#usr/include/linux/caif
+#usr/include/linux/caif/caif_socket.h
+#usr/include/linux/caif/if_caif.h
 #usr/include/linux/can
 #usr/include/linux/can.h
 #usr/include/linux/can/bcm.h
 #usr/include/linux/can/error.h
+#usr/include/linux/can/gw.h
 #usr/include/linux/can/netlink.h
 #usr/include/linux/can/raw.h
 #usr/include/linux/capability.h
 #usr/include/linux/capi.h
+#usr/include/linux/cciss_defs.h
 #usr/include/linux/cciss_ioctl.h
 #usr/include/linux/cdk.h
 #usr/include/linux/cdrom.h
 #usr/include/linux/ext2_fs.h
 #usr/include/linux/fadvise.h
 #usr/include/linux/falloc.h
+#usr/include/linux/fanotify.h
 #usr/include/linux/fb.h
 #usr/include/linux/fcntl.h
 #usr/include/linux/fd.h
 #usr/include/linux/firewire-constants.h
 #usr/include/linux/flat.h
 #usr/include/linux/fs.h
+#usr/include/linux/fsl_hypervisor.h
 #usr/include/linux/fuse.h
 #usr/include/linux/futex.h
 #usr/include/linux/gameport.h
 #usr/include/linux/genetlink.h
 #usr/include/linux/gfs2_ondisk.h
 #usr/include/linux/gigaset_dev.h
-#usr/include/linux/hayesesp.h
 #usr/include/linux/hdlc
 #usr/include/linux/hdlc.h
 #usr/include/linux/hdlc/ioctl.h
 #usr/include/linux/if.h
 #usr/include/linux/if_addr.h
 #usr/include/linux/if_addrlabel.h
+#usr/include/linux/if_alg.h
 #usr/include/linux/if_arcnet.h
 #usr/include/linux/if_arp.h
 #usr/include/linux/if_bonding.h
 #usr/include/linux/if_tun.h
 #usr/include/linux/if_tunnel.h
 #usr/include/linux/if_vlan.h
+#usr/include/linux/if_x25.h
 #usr/include/linux/igmp.h
 #usr/include/linux/in.h
 #usr/include/linux/in6.h
 #usr/include/linux/joystick.h
 #usr/include/linux/kd.h
 #usr/include/linux/kdev_t.h
+#usr/include/linux/kernel-page-flags.h
 #usr/include/linux/kernel.h
 #usr/include/linux/kernelcapi.h
 #usr/include/linux/keyboard.h
 #usr/include/linux/keyctl.h
 #usr/include/linux/kvm.h
 #usr/include/linux/kvm_para.h
+#usr/include/linux/l2tp.h
 #usr/include/linux/limits.h
 #usr/include/linux/llc.h
 #usr/include/linux/loop.h
 #usr/include/linux/major.h
 #usr/include/linux/map_to_7segment.h
 #usr/include/linux/matroxfb.h
+#usr/include/linux/media.h
 #usr/include/linux/mempolicy.h
 #usr/include/linux/meye.h
 #usr/include/linux/mii.h
 #usr/include/linux/minix_fs.h
 #usr/include/linux/mman.h
+#usr/include/linux/mmc
+#usr/include/linux/mmc/ioctl.h
 #usr/include/linux/mmtimer.h
 #usr/include/linux/mqueue.h
 #usr/include/linux/mroute.h
 #usr/include/linux/neighbour.h
 #usr/include/linux/net.h
 #usr/include/linux/net_dropmon.h
+#usr/include/linux/net_tstamp.h
 #usr/include/linux/netdevice.h
 #usr/include/linux/netfilter
 #usr/include/linux/netfilter.h
+#usr/include/linux/netfilter/ipset
+#usr/include/linux/netfilter/ipset/ip_set.h
+#usr/include/linux/netfilter/ipset/ip_set_bitmap.h
+#usr/include/linux/netfilter/ipset/ip_set_hash.h
+#usr/include/linux/netfilter/ipset/ip_set_list.h
 #usr/include/linux/netfilter/nf_conntrack_common.h
 #usr/include/linux/netfilter/nf_conntrack_ftp.h
 #usr/include/linux/netfilter/nf_conntrack_sctp.h
 #usr/include/linux/netfilter/nfnetlink_log.h
 #usr/include/linux/netfilter/nfnetlink_queue.h
 #usr/include/linux/netfilter/x_tables.h
+#usr/include/linux/netfilter/xt_AUDIT.h
+#usr/include/linux/netfilter/xt_CHECKSUM.h
 #usr/include/linux/netfilter/xt_CLASSIFY.h
 #usr/include/linux/netfilter/xt_CONNMARK.h
 #usr/include/linux/netfilter/xt_CONNSECMARK.h
+#usr/include/linux/netfilter/xt_CT.h
 #usr/include/linux/netfilter/xt_DSCP.h
+#usr/include/linux/netfilter/xt_IDLETIMER.h
 #usr/include/linux/netfilter/xt_LED.h
 #usr/include/linux/netfilter/xt_MARK.h
 #usr/include/linux/netfilter/xt_NFLOG.h
 #usr/include/linux/netfilter/xt_SECMARK.h
 #usr/include/linux/netfilter/xt_TCPMSS.h
 #usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
+#usr/include/linux/netfilter/xt_TEE.h
 #usr/include/linux/netfilter/xt_TPROXY.h
+#usr/include/linux/netfilter/xt_addrtype.h
 #usr/include/linux/netfilter/xt_cluster.h
 #usr/include/linux/netfilter/xt_comment.h
 #usr/include/linux/netfilter/xt_connbytes.h
 #usr/include/linux/netfilter/xt_connlimit.h
 #usr/include/linux/netfilter/xt_connmark.h
 #usr/include/linux/netfilter/xt_conntrack.h
+#usr/include/linux/netfilter/xt_cpu.h
 #usr/include/linux/netfilter/xt_dccp.h
+#usr/include/linux/netfilter/xt_devgroup.h
 #usr/include/linux/netfilter/xt_dscp.h
 #usr/include/linux/netfilter/xt_esp.h
 #usr/include/linux/netfilter/xt_hashlimit.h
 #usr/include/linux/netfilter/xt_helper.h
 #usr/include/linux/netfilter/xt_iprange.h
+#usr/include/linux/netfilter/xt_ipvs.h
 #usr/include/linux/netfilter/xt_length.h
 #usr/include/linux/netfilter/xt_limit.h
 #usr/include/linux/netfilter/xt_mac.h
 #usr/include/linux/netfilter/xt_realm.h
 #usr/include/linux/netfilter/xt_recent.h
 #usr/include/linux/netfilter/xt_sctp.h
+#usr/include/linux/netfilter/xt_set.h
+#usr/include/linux/netfilter/xt_socket.h
 #usr/include/linux/netfilter/xt_state.h
 #usr/include/linux/netfilter/xt_statistic.h
 #usr/include/linux/netfilter/xt_string.h
 #usr/include/linux/netfilter_bridge/ebt_arp.h
 #usr/include/linux/netfilter_bridge/ebt_arpreply.h
 #usr/include/linux/netfilter_bridge/ebt_ip.h
+#usr/include/linux/netfilter_bridge/ebt_ip6.h
 #usr/include/linux/netfilter_bridge/ebt_limit.h
 #usr/include/linux/netfilter_bridge/ebt_log.h
 #usr/include/linux/netfilter_bridge/ebt_mark_m.h
 #usr/include/linux/netfilter_bridge/ebt_mark_t.h
 #usr/include/linux/netfilter_bridge/ebt_nat.h
+#usr/include/linux/netfilter_bridge/ebt_nflog.h
 #usr/include/linux/netfilter_bridge/ebt_pkttype.h
 #usr/include/linux/netfilter_bridge/ebt_redirect.h
 #usr/include/linux/netfilter_bridge/ebt_stp.h
 #usr/include/linux/netfilter_ipv4/ipt_ecn.h
 #usr/include/linux/netfilter_ipv4/ipt_realm.h
 #usr/include/linux/netfilter_ipv4/ipt_ttl.h
+#usr/include/linux/netfilter_ipv4/nf_nat.h
 #usr/include/linux/netfilter_ipv6
 #usr/include/linux/netfilter_ipv6.h
 #usr/include/linux/netfilter_ipv6/ip6_tables.h
 #usr/include/linux/netfilter_ipv6/ip6t_rt.h
 #usr/include/linux/netlink.h
 #usr/include/linux/netrom.h
+#usr/include/linux/nfc.h
 #usr/include/linux/nfs.h
 #usr/include/linux/nfs2.h
 #usr/include/linux/nfs3.h
 #usr/include/linux/nfs_mount.h
 #usr/include/linux/nfsacl.h
 #usr/include/linux/nfsd
-#usr/include/linux/nfsd/const.h
 #usr/include/linux/nfsd/debug.h
 #usr/include/linux/nfsd/export.h
 #usr/include/linux/nfsd/nfsfh.h
 #usr/include/linux/nfsd/stats.h
-#usr/include/linux/nfsd/syscall.h
 #usr/include/linux/nl80211.h
 #usr/include/linux/nubus.h
 #usr/include/linux/nvram.h
+#usr/include/linux/omap3isp.h
+#usr/include/linux/omapfb.h
 #usr/include/linux/oom.h
 #usr/include/linux/param.h
 #usr/include/linux/parport.h
 #usr/include/linux/ppp_defs.h
 #usr/include/linux/pps.h
 #usr/include/linux/prctl.h
+#usr/include/linux/ptp_clock.h
 #usr/include/linux/ptrace.h
 #usr/include/linux/qnx4_fs.h
 #usr/include/linux/qnxtypes.h
 #usr/include/linux/raid/md_u.h
 #usr/include/linux/random.h
 #usr/include/linux/raw.h
+#usr/include/linux/rds.h
 #usr/include/linux/reboot.h
 #usr/include/linux/reiserfs_fs.h
 #usr/include/linux/reiserfs_xattr.h
 #usr/include/linux/sched.h
 #usr/include/linux/screen_info.h
 #usr/include/linux/sdla.h
+#usr/include/linux/securebits.h
 #usr/include/linux/selinux_netlink.h
 #usr/include/linux/sem.h
 #usr/include/linux/serial.h
 #usr/include/linux/shm.h
 #usr/include/linux/signal.h
 #usr/include/linux/signalfd.h
-#usr/include/linux/smb.h
-#usr/include/linux/smb_fs.h
-#usr/include/linux/smb_mount.h
-#usr/include/linux/smbno.h
 #usr/include/linux/snmp.h
 #usr/include/linux/socket.h
 #usr/include/linux/sockios.h
 #usr/include/linux/sysctl.h
 #usr/include/linux/taskstats.h
 #usr/include/linux/tc_act
+#usr/include/linux/tc_act/tc_csum.h
 #usr/include/linux/tc_act/tc_gact.h
 #usr/include/linux/tc_act/tc_ipt.h
 #usr/include/linux/tc_act/tc_mirred.h
 #usr/include/linux/usb
 #usr/include/linux/usb/audio.h
 #usr/include/linux/usb/cdc.h
+#usr/include/linux/usb/ch11.h
 #usr/include/linux/usb/ch9.h
+#usr/include/linux/usb/functionfs.h
 #usr/include/linux/usb/g_printer.h
 #usr/include/linux/usb/gadgetfs.h
 #usr/include/linux/usb/midi.h
 #usr/include/linux/usb/tmc.h
-#usr/include/linux/usb/vstusb.h
+#usr/include/linux/usb/video.h
 #usr/include/linux/usbdevice_fs.h
 #usr/include/linux/utime.h
 #usr/include/linux/utsname.h
+#usr/include/linux/uvcvideo.h
+#usr/include/linux/v4l2-mediabus.h
+#usr/include/linux/v4l2-subdev.h
 #usr/include/linux/version.h
 #usr/include/linux/veth.h
-#usr/include/linux/videodev.h
+#usr/include/linux/vhost.h
 #usr/include/linux/videodev2.h
-#usr/include/linux/videotext.h
 #usr/include/linux/virtio_9p.h
 #usr/include/linux/virtio_balloon.h
 #usr/include/linux/virtio_blk.h
 #usr/include/mtd/nftl-user.h
 #usr/include/mtd/ubi-user.h
 #usr/include/rdma
+#usr/include/rdma/ib_user_cm.h
 #usr/include/rdma/ib_user_mad.h
+#usr/include/rdma/ib_user_sa.h
+#usr/include/rdma/ib_user_verbs.h
+#usr/include/rdma/rdma_netlink.h
+#usr/include/rdma/rdma_user_cm.h
 #usr/include/scsi
-#usr/include/scsi/scsi.h
+#usr/include/scsi/fc
+#usr/include/scsi/fc/fc_els.h
+#usr/include/scsi/fc/fc_fs.h
+#usr/include/scsi/fc/fc_gs.h
+#usr/include/scsi/fc/fc_ns.h
 #usr/include/scsi/scsi_bsg_fc.h
 #usr/include/scsi/scsi_netlink.h
 #usr/include/scsi/scsi_netlink_fc.h
 #usr/include/sound/hdspm.h
 #usr/include/sound/sb16_csp.h
 #usr/include/sound/sfnt_info.h
-#usr/include/sound/sscape_ioctl.h
 #usr/include/video
 #usr/include/video/edid.h
 #usr/include/video/sisfb.h
 #usr/include/video/uvesafb.h
 #usr/include/xen
 #usr/include/xen/evtchn.h
+#usr/include/xen/privcmd.h
index af034e8e0ef6ff7e121093bddd7fe85a080cd7b1..d30cbf5694f33a4f1a22bc35b343cd6b581b0a24 100644 (file)
@@ -149,9 +149,14 @@ sbin/xtables-multi
 #usr/include/libnfnetlink/linux_nfnetlink.h
 #usr/include/libnfnetlink/linux_nfnetlink_compat.h
 #usr/include/linux/netfilter/Kbuild
+#usr/include/linux/netfilter/ipset
 #usr/include/linux/netfilter/ipset/Kbuild
+#usr/include/linux/netfilter/ipset/ip_set.h
 #usr/include/linux/netfilter/ipset/ip_set_ahash.h
+#usr/include/linux/netfilter/ipset/ip_set_bitmap.h
 #usr/include/linux/netfilter/ipset/ip_set_getport.h
+#usr/include/linux/netfilter/ipset/ip_set_hash.h
+#usr/include/linux/netfilter/ipset/ip_set_list.h
 #usr/include/linux/netfilter/ipset/ip_set_timeout.h
 #usr/include/linux/netfilter/ipset/pfxlen.h
 #usr/include/linux/netfilter/nf_conntrack_amanda.h
@@ -166,8 +171,19 @@ sbin/xtables-multi
 #usr/include/linux/netfilter/nf_conntrack_sip.h
 #usr/include/linux/netfilter/nf_conntrack_snmp.h
 #usr/include/linux/netfilter/nf_conntrack_tftp.h
+#usr/include/linux/netfilter/xt_AUDIT.h
+#usr/include/linux/netfilter/xt_CHECKSUM.h
+#usr/include/linux/netfilter/xt_CT.h
+#usr/include/linux/netfilter/xt_IDLETIMER.h
 #usr/include/linux/netfilter/xt_IMQ.h
+#usr/include/linux/netfilter/xt_TEE.h
+#usr/include/linux/netfilter/xt_addrtype.h
+#usr/include/linux/netfilter/xt_cpu.h
+#usr/include/linux/netfilter/xt_devgroup.h
+#usr/include/linux/netfilter/xt_ipvs.h
 #usr/include/linux/netfilter/xt_layer7.h
+#usr/include/linux/netfilter/xt_set.h
+#usr/include/linux/netfilter/xt_socket.h
 #usr/include/net/netfilter
 #usr/include/net/netfilter/nf_conntrack_tuple.h
 #usr/include/net/netfilter/nf_nat.h
index 40d3546d3184391a9826bd074406035e908cedaf..7e7d50acf942913a6371950364b97c71eb766016 100644 (file)
@@ -1,2 +1,2 @@
-opt/vdr/bin/w_scan
-opt/vdr/bin/w_scan_start
+usr/bin/w_scan
+#usr/share/man/man1/w_scan.1
index 4f94fe8a2dbbd0da3fe61fdb51f4aee63eaf0baf..6c6b7911999aa06eb0a54ca1c591a8e1ae1f3bdf 100644 (file)
@@ -26,7 +26,7 @@ include Config
 
 VERSUFIX=ipfire$(KCFG)
 
-VER        = 3.6.2-1-snp
+VER        = 3.6.6-1-snp
 
 ifeq "$(KCFG)" "-xen"
        KVER = 2.6.32.60
@@ -47,7 +47,7 @@ objects = $(DL_FILE) asix-4.4.0.tar.xz
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz
 
-$(DL_FILE)_MD5 = 3adbfc455f883d297e02cac2d8d2c40f
+$(DL_FILE)_MD5 = e20f1b5a50095cf3483fd171ea9d3f92
 
 asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde
 
index c9ff24ef76984b0240c3e0465a46d692388b3c05..213b46e2724dc95c8deb9e2bfee85566b77f089a 100644 (file)
@@ -203,7 +203,9 @@ $(TARGET) :
 ifeq "$(MACHINE_TYPE)" "arm"
        rm -vf /etc/rc.d/init.d/{acpid,checkfstab}
 else
-       ln -sf ../init.d/acpid       /etc/rc.d/rcsysinit.d/S51acpid
+       ln -sf ../init.d/acpid       /etc/rc.d/rc3.d/S12acpid
+       ln -sf ../init.d/acpid       /etc/rc.d/rc0.d/K87acpid
+       ln -sf ../init.d/acpid       /etc/rc.d/rc6.d/K87acpid
        ln -sf ../init.d/checkfstab  /etc/rc.d/rcsysinit.d/S19checkfstab
 endif
 
index 80050ccfc73d733e20a088366fd63223e3f7dab9..dbe0896013c2b567ecdf5ed9a8b8974a6c8cf7a1 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -40,16 +40,12 @@ DEPS           = ""
 
 VERSUFIX=ipfire$(KCFG)
 
-ifeq "$(HEADERS)" "1"
 ifeq "$(TOOLS)" "1"
-       TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)-tools
+       TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)-tools
        HEADERS_PREFIX = /tools
-else
-       TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)
-       HEADERS_PREFIX = /usr
-endif
 else
        TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
+       HEADERS_PREFIX = /usr
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -151,7 +147,7 @@ ifeq "$(KCFG)" "-rpi"
        cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
 endif
 
-ifeq "$(HEADERS)" "1"
+ifeq "$(KCFG)" "-headers"
        # Install the header files
        cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install
        -mkdir -pv $(BUILDROOT)/$(HEADERS_PREFIX)/include
index d42abaf0ae9126e3f22266ee315f3ed6ccddb488..fa99ea0b15b00bb456c04c1888ff4dff38a3ff4b 100644 (file)
@@ -77,11 +77,19 @@ dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+       #Install obsolete V4L1 videodev.h
+       cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h
+
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cp -vf $(DIR_SRC)/config/motion/motion.conf /etc
        install -v -m 644 $(DIR_SRC)/config/backup/includes/motion \
                         /var/ipfire/backup/addons/includes/motion
+
+       #Remove obsolete V4L1 videodev.h
+       rm -f /usr/include/linux/videodev.h
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/lfs/vdr b/lfs/vdr
index ca8f0dad8fec34fd979a376d509099078eb92eb2..46ea5d3f90b45994bde0fa9e6e9b60805c85926d 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -89,7 +89,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       
+
+       # Install obsolete V4L1 videodev header.
+       cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h
+
        # Accept also DVB_API_VERSION 5
        cd $(DIR_APP) && sed -i -e "s|DVB_API_VERSION != 3|& \&\& DVB_API_VERSION != 5|g" dvbdevice.h
        
@@ -120,5 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -sf ../init.d/vdr /etc/rc.d/rc6.d/K40vdr
        install -v -m 644 $(DIR_SRC)/config/backup/includes/vdr \
                         /var/ipfire/backup/addons/includes/vdr
+
+       # Remove obsolete V4L1 videodev header.
+       rm -f /usr/include/linux/videodev.h
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
index e58cf50f4ff3cd781c28170982e4a3447b758bba..f6e8b9d27f147654d51ac9032a47ab9c9a03e032 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@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        #
@@ -25,7 +25,7 @@
 include Config
 
 
-VER        = 20080105
+VER        = 20121111
 
 THISAPP    = w_scan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = w_scan
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9541244559d2da9442a137f7891d45d3
+$(DL_FILE)_MD5 = 30da05747fed9988e11ebc7745f5e71f
 
 install : $(TARGET)
 
@@ -78,10 +78,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch < $(DIR_SRC)/src/patches/w_scan-ipfire.patch 
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-       -mkdir -pv /opt/vdr/bin
-       cd $(DIR_APP) && install -m 755 w_scan /opt/vdr/bin/
-       cd $(DIR_APP) && install -m 755 w_scan_start.sh /opt/vdr/bin/w_scan_start
+       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 b60723d6ff2be2e4ed9f4d45d2380f24223ec011..7cf5945f9d360ba3cdac72647c557fdcfd88f359 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -258,7 +258,7 @@ buildtoolchain() {
     lfsmake1 ccache                    PASS=1
     lfsmake1 binutils                  PASS=1
     lfsmake1 gcc                       PASS=1
-    lfsmake1 linux2                    TOOLS=1 HEADERS=1
+    lfsmake1 linux                     TOOLS=1 KCFG="-headers"
     lfsmake1 glibc
     lfsmake1 cleanup-toolchain         PASS=1
     lfsmake1 binutils                  PASS=2
@@ -294,7 +294,7 @@ buildbase() {
     LOGFILE="$BASEDIR/log/_build.base.log"
     export LOGFILE
     lfsmake2 stage2
-    lfsmake2 linux2                    HEADERS=1
+    lfsmake2 linux                     KCFG="-headers"
     lfsmake2 man-pages
     lfsmake2 glibc
     lfsmake2 tzdata
index 1f5e07efad03d04713dfc3cf6f6c9b6d1e39fc7f..58c16c3b42fedd64c0badade1c3003ffb2328c40 100644 (file)
@@ -23,7 +23,7 @@ case "${1}" in
 
                sleep ${KILLDELAY}
 
-               if [ "${error_value}" = 0 ]; then
+               if [ "${error_value}" = 0 -o "${error_value}" = 2 ]; then
                        echo_ok
                else
                        echo_failure
@@ -35,7 +35,7 @@ case "${1}" in
 
                sleep ${KILLDELAY}
 
-               if [ "${error_value}" = 0 ]; then
+               if [ "${error_value}" = 0 -o "${error_value}" = 2 ]; then
                        echo_ok
                else
                        echo_failure
diff --git a/src/patches/w_scan-ipfire.patch b/src/patches/w_scan-ipfire.patch
deleted file mode 100644 (file)
index 69ad359..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur w_scan_start.sh w_scan_start.sh
---- w_scan_start.sh    2008-01-05 19:58:44.000000000 +0100
-+++ w_scan_start.sh    2008-05-14 18:29:21.000000000 +0200
-@@ -6,11 +6,11 @@
- # - 20060812: first version
- # - 20060822: many improvements
- # cu@vdr-portal
--#
-+# - 20080514: patches for ipfire by arne_f@ipfire.org
- #######################################################
- umask 022
--export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin"
-+export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin:/opt/vdr/bin"
- DATE="$(date +%Y)$(date +%m)$(date +%d)" # $DATE == "YYYYMMDD", i.e. 20060710
- W_SCAN=$(which w_scan 2>/dev/null)
- UDEVSTART=$(which udevstart)
-@@ -224,7 +224,7 @@
-               echo "Checking for ct-vdr style startscript.."
-               if [ -e /etc/init.d/vdr ]; then                 # c't-vdr
-                       echo_yes
--                      $(/etc/init.d/vdr stop)
-+                      /etc/init.d/vdr stop
-                       stopped=true
-               else
-                       echo_no
-@@ -375,7 +375,7 @@
-       # which generic dvb modules should be always loaded?
-       MODULES_TO_LOAD="videodev v4l1_compat \
--                      v4l2_common video_buf dvb_core ves1820 \
-+                      v4l2_common dvb_core ves1820 \
-                       dvb_ttpci \
-                       budget_ci budget_av budget_ci budget "
-@@ -661,9 +661,11 @@
-       echo -e -n $NORMAL
-       echo -e -n "\\033[1;34m"
-       if [ ${WHAT_TO_SCAN:0:2} != 0 ]; then
-+              echo ":->W_SCAN $DATE DVB-T" >> channels.conf-$DATE
-               $W_SCAN >> channels.conf-$DATE
-       fi
--      if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then 
-+      if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then
-+              echo ":->W_SCAN $DATE DVB-C" >> channels.conf-$DATE 
-               $W_SCAN -fc >> channels.conf-$DATE
-       fi 
-       echo -e -n $NORMAL
-@@ -671,55 +673,34 @@
- function CopyConf ()
- {
--      if [ -s channels.conf-$DATE ]; then
--              clear
--              echo -e -n $SUCCESS
--              echo "****************************************************************"
--              echo "*                                                              *"
--              echo "* w_scan is done.                                              *"
--              echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS".            *"
--              echo "* Should I copy this to default location for you? [y/n]        *"
--              echo "*                                                              *"
--              echo "****************************************************************"
--              echo -e -n $NORMAL && tput sgr0
--              read RESPONSE
--              echo -e -n $NORMAL
--              if [ "$RESPONSE" != "y" ]; then
--                      echo "Copying channels.conf skipped - okay."
--                      echo "The channels.conf generated can be found at"
--                      echo -n -e "\\033[1;34m"
--                      echo "$(pwd)/channels.conf-$DATE"
--                      echo ""
--                      echo -e -n $NORMAL
--              else
--                      if [ -d /etc/vdr ]; then
--                              mv /etc/vdr/channels.conf /etc/vdr/channels.conf-backup$DATE
--                              cp channels.conf-$DATE /etc/vdr/channels.conf
--                      fi
--                      if [ -d /var/lib/vdr ]; then
--                              mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE
--                              cp channels.conf-$DATE /var/lib/vdr/channels.conf
--                      fi                      
--              fi
--        else
--              clear
--              echo -e -n $FAILURE
--              echo "****************************************************************"
--              echo "*                                                              *"
--              echo "* Something went wrong. The channels.conf generated is *EMPTY*!*"
--              echo "* To analyze your problem I recommend the command              *"
--              echo "*    './w_scan 2>&1 | tee w_scan.log-dvbt &&                   *"
--              echo "*     ./w_scan -fc 2>&1 | tee w_scan.log-dvbc'                 *"
--              echo "*                                                              *"
--              echo "* w_scan will report the problem into the logfiles             *"
--              echo "* w_scan.log-dvbt and w_scan.log-dvbc.                         *"
--              echo "*                                                              *"
--              echo "* PRESS ANY KEY TO CONTINUE                                    *"
--              echo "****************************************************************"
-+      echo -e -n $SUCCESS
-+      echo "****************************************************************"
-+      echo "*                                                              *"
-+      echo "* w_scan is done.                                              *"
-+      echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS".            *"
-+      echo "* Should I copy this to default location for you? [y/n]        *"
-+      echo "*                                                              *"
-+      echo "****************************************************************"
-+      echo -e -n $NORMAL && tput sgr0
-+      read RESPONSE
-+      echo -e -n $NORMAL
-+      if [ "$RESPONSE" != "y" ]; then
-+              echo "Copying channels.conf skipped - okay."
-+              echo "The channels.conf generated can be found at"
-+              echo -n -e "\\033[1;34m"
-+              echo "$(pwd)/channels.conf-$DATE"
-+              echo ""
-               echo -e -n $NORMAL
--              read
-+      else
-+              if [ -d /opt/vdr/etc ]; then
-+                      mv /opt/vdr/etc/channels.conf /opt/vdr/etc/channels.conf-backup$DATE
-+                      cp channels.conf-$DATE /opt/vdr/etc/channels.conf
-+              fi
-+              if [ -d /var/lib/vdr ]; then
-+                      mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE
-+                      cp channels.conf-$DATE /var/lib/vdr/channels.conf
-+              fi                      
-       fi
--
- }
- # the program itself.