[Glibc-bsd-commits] r3044 - in trunk/kfreebsd-8/debian: . patches
Petr Salinger
ps-guest at alioth.debian.org
Mon Jun 14 10:58:48 UTC 2010
Author: ps-guest
Date: 2010-06-14 10:58:45 +0000 (Mon, 14 Jun 2010)
New Revision: 3044
Removed:
trunk/kfreebsd-8/debian/patches/000_mcinit.diff
trunk/kfreebsd-8/debian/patches/000_multicast.diff
trunk/kfreebsd-8/debian/patches/000_nfsclient.diff
trunk/kfreebsd-8/debian/patches/000_nfsreconnect.diff
trunk/kfreebsd-8/debian/patches/000_rename.diff
trunk/kfreebsd-8/debian/patches/000_sctp.diff
trunk/kfreebsd-8/debian/patches/000_zfs.diff
trunk/kfreebsd-8/debian/patches/000_zfsmac.diff
trunk/kfreebsd-8/debian/patches/000_zfsvaccess.diff
trunk/kfreebsd-8/debian/patches/105_pts.diff
Modified:
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff
trunk/kfreebsd-8/debian/patches/902_version.diff
trunk/kfreebsd-8/debian/patches/913_uudecode.diff
trunk/kfreebsd-8/debian/patches/999_config.diff
trunk/kfreebsd-8/debian/patches/series
trunk/kfreebsd-8/debian/rules
Log:
releng 8.1 have been created
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/changelog 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,3 +1,12 @@
+kfreebsd-8 (8.1~rc0-1) EXPERIMENTAL; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream snapshot (RELENG_8_1)
+ - 000_*.diff, 105_pts.diff merged upstream
+
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 09 Jun 2010 14:31:53 +0200
+
kfreebsd-8 (8.0-7) unstable; urgency=low
* Force NO_WERROR to build aicasm, now that it is not the default
Deleted: trunk/kfreebsd-8/debian/patches/000_mcinit.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_mcinit.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/000_mcinit.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,18 +0,0 @@
---- a/sys/netinet/ip_mroute.c (revision 201431)
-+++ b/sys/netinet/ip_mroute.c (working copy)
-@@ -1384,6 +1384,15 @@ fail:
- rt->mfc_rp.s_addr = INADDR_ANY;
- rt->mfc_bw_meter = NULL;
-
-+ /* initialize pkt counters per src-grp */
-+ rt->mfc_pkt_cnt = 0;
-+ rt->mfc_byte_cnt = 0;
-+ rt->mfc_wrong_if = 0;
-+ timevalclear(&rt->mfc_last_assert);
-+
-+ TAILQ_INIT(&rt->mfc_stall);
-+ rt->mfc_nstall = 0;
-+
- /* link into table */
- LIST_INSERT_HEAD(&mfchashtbl[hash], rt, mfc_hash);
- TAILQ_INSERT_HEAD(&rt->mfc_stall, rte, rte_link);
Deleted: trunk/kfreebsd-8/debian/patches/000_multicast.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_multicast.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/000_multicast.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,96 +0,0 @@
---- a/sys/netinet/raw_ip.c (revision 200583)
-+++ b/sys/netinet/raw_ip.c (working copy)
-@@ -343,17 +343,35 @@ rip_input(struct mbuf *m, int off)
- */
- if (inp->inp_moptions != NULL &&
- IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-- struct sockaddr_in group;
-+ /*
-+ * If the incoming datagram is for IGMP, allow it
-+ * through unconditionally to the raw socket.
-+ *
-+ * In the case of IGMPv2, we may not have explicitly
-+ * joined the group, and may have set IFF_ALLMULTI
-+ * on the interface. imo_multi_filter() may discard
-+ * control traffic we actually need to see.
-+ *
-+ * Userland multicast routing daemons should continue
-+ * filter the control traffic appropriately.
-+ */
- int blocked;
-
-- bzero(&group, sizeof(struct sockaddr_in));
-- group.sin_len = sizeof(struct sockaddr_in);
-- group.sin_family = AF_INET;
-- group.sin_addr = ip->ip_dst;
-+ blocked = MCAST_PASS;
-+ if (proto != IPPROTO_IGMP) {
-+ struct sockaddr_in group;
-
-- blocked = imo_multi_filter(inp->inp_moptions, ifp,
-- (struct sockaddr *)&group,
-- (struct sockaddr *)&ripsrc);
-+ bzero(&group, sizeof(struct sockaddr_in));
-+ group.sin_len = sizeof(struct sockaddr_in);
-+ group.sin_family = AF_INET;
-+ group.sin_addr = ip->ip_dst;
-+
-+ blocked = imo_multi_filter(inp->inp_moptions,
-+ ifp,
-+ (struct sockaddr *)&group,
-+ (struct sockaddr *)&ripsrc);
-+ }
-+
- if (blocked != MCAST_PASS) {
- IPSTAT_INC(ips_notmember);
- continue;
---- a/sys/netinet6/raw_ip6.c (revision 200583)
-+++ b/sys/netinet6/raw_ip6.c (working copy)
-@@ -213,17 +213,39 @@ rip6_input(struct mbuf **mp, int *offp, int proto)
- */
- if (in6p->in6p_moptions &&
- IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {
-- struct sockaddr_in6 mcaddr;
-+ /*
-+ * If the incoming datagram is for MLD, allow it
-+ * through unconditionally to the raw socket.
-+ *
-+ * Use the M_RTALERT_MLD flag to check for MLD
-+ * traffic without having to inspect the mbuf chain
-+ * more deeply, as all MLDv1/v2 host messages MUST
-+ * contain the Router Alert option.
-+ *
-+ * In the case of MLDv1, we may not have explicitly
-+ * joined the group, and may have set IFF_ALLMULTI
-+ * on the interface. im6o_mc_filter() may discard
-+ * control traffic we actually need to see.
-+ *
-+ * Userland multicast routing daemons should continue
-+ * filter the control traffic appropriately.
-+ */
- int blocked;
-
-- bzero(&mcaddr, sizeof(struct sockaddr_in6));
-- mcaddr.sin6_len = sizeof(struct sockaddr_in6);
-- mcaddr.sin6_family = AF_INET6;
-- mcaddr.sin6_addr = ip6->ip6_dst;
-+ blocked = MCAST_PASS;
-+ if ((m->m_flags & M_RTALERT_MLD) == 0) {
-+ struct sockaddr_in6 mcaddr;
-
-- blocked = im6o_mc_filter(in6p->in6p_moptions, ifp,
-- (struct sockaddr *)&mcaddr,
-- (struct sockaddr *)&fromsa);
-+ bzero(&mcaddr, sizeof(struct sockaddr_in6));
-+ mcaddr.sin6_len = sizeof(struct sockaddr_in6);
-+ mcaddr.sin6_family = AF_INET6;
-+ mcaddr.sin6_addr = ip6->ip6_dst;
-+
-+ blocked = im6o_mc_filter(in6p->in6p_moptions,
-+ ifp,
-+ (struct sockaddr *)&mcaddr,
-+ (struct sockaddr *)&fromsa);
-+ }
- if (blocked != MCAST_PASS) {
- IP6STAT_INC(ip6s_notmember);
- continue;
Deleted: trunk/kfreebsd-8/debian/patches/000_nfsclient.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_nfsclient.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/000_nfsclient.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,14 +0,0 @@
---- a/sys/nfsclient/nfs_vfsops.c
-+++ b/sys/nfsclient/nfs_vfsops.c
-@@ -1074,6 +1074,11 @@
- error = EINVAL;
- goto out;
- }
-+ if (args.fhsize < 0 || args.fhsize > NFSX_V3FHMAX) {
-+ vfs_mount_error(mp, "Bad file handle");
-+ error = EINVAL;
-+ goto out;
-+ }
-
- if (mp->mnt_flag & MNT_UPDATE) {
- struct nfsmount *nmp = VFSTONFS(mp);
Deleted: trunk/kfreebsd-8/debian/patches/000_nfsreconnect.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_nfsreconnect.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/000_nfsreconnect.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,25 +0,0 @@
---- a/sys/rpc/clnt_vc.c (revision 200583)
-+++ b/sys/rpc/clnt_vc.c (working copy)
-@@ -413,6 +413,22 @@ call_again:
-
- cr->cr_xid = xid;
- mtx_lock(&ct->ct_lock);
-+ /*
-+ * Check to see if the other end has already started to close down
-+ * the connection. The upcall will have set ct_error.re_status
-+ * to RPC_CANTRECV if this is the case.
-+ * If the other end starts to close down the connection after this
-+ * point, it will be detected later when cr_error is checked,
-+ * since the request is in the ct_pending queue.
-+ */
-+ if (ct->ct_error.re_status == RPC_CANTRECV) {
-+ if (errp != &ct->ct_error) {
-+ errp->re_errno = ct->ct_error.re_errno;
-+ errp->re_status = RPC_CANTRECV;
-+ }
-+ stat = RPC_CANTRECV;
-+ goto out;
-+ }
- TAILQ_INSERT_TAIL(&ct->ct_pending, cr, cr_link);
- mtx_unlock(&ct->ct_lock);
-
Deleted: trunk/kfreebsd-8/debian/patches/000_rename.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_rename.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/000_rename.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,30 +0,0 @@
-
-Added into FreeBSD-EN-10:01.freebsd
-
-http://lists.freebsd.org/pipermail/svn-src-all/2009-November/015448.html
-
-Log:
- When rename("a", "b/.") is performed, target namei() call returns
- dvp == vp. Rename syscall does not check for the case, and at least
- ufs_rename() cannot deal with it. POSIX explicitely requires that both
- rename(2) and rmdir(2) return EINVAL when any of the pathes end in "/.".
-
- Detect the slashdot lookup for RENAME or REMOVE in lookup(), and return
- EINVAL.
-
-
---- a/sys/kern/vfs_lookup.c
-+++ b/sys/kern/vfs_lookup.c
-@@ -552,6 +552,12 @@
- else
- cnp->cn_flags &= ~ISLASTCN;
-
-+ if ((cnp->cn_flags & ISLASTCN) != 0 &&
-+ cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.' &&
-+ (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)) {
-+ error = EINVAL;
-+ goto bad;
-+ }
-
- /*
- * Check for degenerate name (e.g. / or "")
Deleted: trunk/kfreebsd-8/debian/patches/000_sctp.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_sctp.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/000_sctp.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,12 +0,0 @@
---- a/sys/netinet/sctp_input.c (revision 200583)
-+++ b/sys/netinet/sctp_input.c (working copy)
-@@ -834,6 +834,9 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *c
- return;
- } else {
- sctp_update_acked(stcb, cp, net, abort_flag);
-+ if (*abort_flag) {
-+ return;
-+ }
- }
- if (asoc->control_pdapi) {
- /*
Deleted: trunk/kfreebsd-8/debian/patches/000_zfs.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_zfs.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/000_zfs.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,21 +0,0 @@
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (revision 200583)
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (working copy)
-@@ -60,10 +60,14 @@ zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64
- {
- VATTR_NULL(vap);
- vap->va_mask = (uint_t)mask;
-- vap->va_type = IFTOVT(mode);
-- vap->va_mode = mode & MODEMASK;
-- vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid;
-- vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid;
-+ if (mask & AT_TYPE)
-+ vap->va_type = IFTOVT(mode);
-+ if (mask & AT_MODE)
-+ vap->va_mode = mode & MODEMASK;
-+ if (mask & AT_UID)
-+ vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid;
-+ if (mask & AT_GID)
-+ vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid;
- vap->va_rdev = zfs_cmpldev(rdev);
- vap->va_nodeid = nodeid;
- }
Deleted: trunk/kfreebsd-8/debian/patches/000_zfsmac.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_zfsmac.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/000_zfsmac.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,76 +0,0 @@
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c (revision 200583)
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c (working copy)
-@@ -143,16 +143,19 @@ zfs_znode_cache_constructor(void *buf, void *arg,
-
- POINTER_INVALIDATE(&zp->z_zfsvfs);
- ASSERT(!POINTER_IS_VALID(zp->z_zfsvfs));
-- ASSERT(vfsp != NULL);
-
-- error = getnewvnode("zfs", vfsp, &zfs_vnodeops, &vp);
-- if (error != 0 && (kmflags & KM_NOSLEEP))
-- return (-1);
-- ASSERT(error == 0);
-- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-- zp->z_vnode = vp;
-- vp->v_data = (caddr_t)zp;
-- VN_LOCK_AREC(vp);
-+ if (vfsp != NULL) {
-+ error = getnewvnode("zfs", vfsp, &zfs_vnodeops, &vp);
-+ if (error != 0 && (kmflags & KM_NOSLEEP))
-+ return (-1);
-+ ASSERT(error == 0);
-+ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-+ zp->z_vnode = vp;
-+ vp->v_data = (caddr_t)zp;
-+ VN_LOCK_AREC(vp);
-+ } else {
-+ zp->z_vnode = NULL;
-+ }
-
- list_link_init(&zp->z_link_node);
-
-@@ -1435,7 +1438,7 @@ zfs_create_fs(objset_t *os, cred_t *cr, nvlist_t *
- nvpair_t *elem;
- int error;
- znode_t *rootzp = NULL;
-- vnode_t *vp;
-+ vnode_t vnode;
- vattr_t vattr;
- znode_t *zp;
-
-@@ -1504,13 +1507,13 @@ zfs_create_fs(objset_t *os, cred_t *cr, nvlist_t *
- vattr.va_gid = crgetgid(cr);
-
- rootzp = kmem_cache_alloc(znode_cache, KM_SLEEP);
-- zfs_znode_cache_constructor(rootzp, &zfsvfs, 0);
-+ zfs_znode_cache_constructor(rootzp, NULL, 0);
- rootzp->z_unlinked = 0;
- rootzp->z_atime_dirty = 0;
-
-- vp = ZTOV(rootzp);
-- vp->v_type = VDIR;
-- VN_LOCK_ASHARE(vp);
-+ vnode.v_type = VDIR;
-+ vnode.v_data = rootzp;
-+ rootzp->z_vnode = &vnode;
-
- bzero(&zfsvfs, sizeof (zfsvfs_t));
-
-@@ -1539,16 +1542,10 @@ zfs_create_fs(objset_t *os, cred_t *cr, nvlist_t *
- ASSERT(error == 0);
- POINTER_INVALIDATE(&rootzp->z_zfsvfs);
-
-- VI_LOCK(vp);
-- ZTOV(rootzp)->v_data = NULL;
-- ZTOV(rootzp)->v_count = 0;
-- ZTOV(rootzp)->v_holdcnt = 0;
-- rootzp->z_vnode = NULL;
-- VOP_UNLOCK(vp, 0);
-- vdestroy(vp);
- dmu_buf_rele(rootzp->z_dbuf, NULL);
- rootzp->z_dbuf = NULL;
- mutex_destroy(&zfsvfs.z_znodes_lock);
-+ rootzp->z_vnode = NULL;
- kmem_cache_free(znode_cache, rootzp);
- }
-
Deleted: trunk/kfreebsd-8/debian/patches/000_zfsvaccess.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_zfsvaccess.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/000_zfsvaccess.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,66 +0,0 @@
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c (revision 200583)
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c (working copy)
-@@ -3981,21 +3981,33 @@ zfs_freebsd_access(ap)
- struct thread *a_td;
- } */ *ap;
- {
-+ accmode_t accmode;
-+ int error = 0;
-
- /*
-- * ZFS itself only knowns about VREAD, VWRITE and VEXEC, the rest
-- * we have to handle by calling vaccess().
-+ * ZFS itself only knowns about VREAD, VWRITE, VEXEC and VAPPEND,
- */
-- if ((ap->a_accmode & ~(VREAD|VWRITE|VEXEC)) != 0) {
-- vnode_t *vp = ap->a_vp;
-- znode_t *zp = VTOZ(vp);
-- znode_phys_t *zphys = zp->z_phys;
-+ accmode = ap->a_accmode & (VREAD|VWRITE|VEXEC|VAPPEND);
-+ if (accmode != 0)
-+ error = zfs_access(ap->a_vp, accmode, 0, ap->a_cred, NULL);
-
-- return (vaccess(vp->v_type, zphys->zp_mode, zphys->zp_uid,
-- zphys->zp_gid, ap->a_accmode, ap->a_cred, NULL));
-+ /*
-+ * VADMIN has to be handled by vaccess().
-+ */
-+ if (error == 0) {
-+ accmode = ap->a_accmode & ~(VREAD|VWRITE|VEXEC|VAPPEND);
-+ if (accmode != 0) {
-+ vnode_t *vp = ap->a_vp;
-+ znode_t *zp = VTOZ(vp);
-+ znode_phys_t *zphys = zp->z_phys;
-+
-+ error = vaccess(vp->v_type, zphys->zp_mode,
-+ zphys->zp_uid, zphys->zp_gid, accmode, ap->a_cred,
-+ NULL);
-+ }
- }
-
-- return (zfs_access(ap->a_vp, ap->a_accmode, 0, ap->a_cred, NULL));
-+ return (error);
- }
-
- static int
---- a/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h (revision 200583)
-+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h (working copy)
-@@ -304,7 +304,6 @@ typedef struct xvattr {
- * VOP_ACCESS flags
- */
- #define V_ACE_MASK 0x1 /* mask represents NFSv4 ACE permissions */
--#define V_APPEND 0x2 /* want to do append only check */
-
- /*
- * Flags for vnode operations.
---- a/sys/cddl/compat/opensolaris/sys/vnode.h (revision 200583)
-+++ b/sys/cddl/compat/opensolaris/sys/vnode.h (working copy)
-@@ -57,6 +57,8 @@ typedef struct vop_vector vnodeops_t;
-
- #define v_count v_usecount
-
-+#define V_APPEND VAPPEND
-+
- static __inline int
- vn_is_readonly(vnode_t *vp)
- {
Modified: trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,11 +1,11 @@
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
-@@ -216,7 +216,7 @@
+@@ -217,7 +217,7 @@
SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
-static int pg_ps_enabled;
+static int pg_ps_enabled = 1;
- SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0,
+ SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN, &pg_ps_enabled, 0,
"Are large page mappings enabled?");
Deleted: trunk/kfreebsd-8/debian/patches/105_pts.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/105_pts.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/105_pts.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,16 +0,0 @@
-
-fix leak of the vnodes
-http://lists.freebsd.org/pipermail/freebsd-hackers/2010-April/031433.html
-
---- a/sys/kern/tty_pts.c
-+++ b/sys/kern/tty_pts.c
-@@ -589,6 +589,9 @@
- tty_lock(tp);
- tty_rel_gone(tp);
-
-+ if (fp->f_vnode != NULL)
-+ return (vnops.fo_close(fp, td));
-+
- return (0);
- }
-
Modified: trunk/kfreebsd-8/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/902_version.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/902_version.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,10 +1,10 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -110,7 +110,7 @@
+@@ -136,7 +136,7 @@
cat << EOF > vers.c
$COPYRIGHT
- #define SCCSSTR "@(#)${VERSION} #${v}${svn}: ${t}"
--#define VERSTR "${VERSION} #${v}${svn}: ${t}\\n ${u}@${h}:${d}\\n"
+ #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
+-#define VERSTR "${VERSION} #${v}${svn}${git}: ${t}\\n ${u}@${h}:${d}\\n"
+#define VERSTR "#${v} ${t}\\n"
#define RELSTR "${RELEASE}"
Modified: trunk/kfreebsd-8/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/913_uudecode.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/913_uudecode.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -96,13 +96,21 @@
+ uudecode -o- ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu > ${.TARGET}
.include <bsd.kmod.mk>
---- a/sys/modules/iwnfw/Makefile
-+++ b/sys/modules/iwnfw/Makefile
-@@ -8,6 +8,6 @@
- CLEANFILES= iwlwifi-4965-4.44.17.fw
+--- a/sys/modules/iwnfw/Makefile.inc
++++ b/sys/modules/iwnfw/Makefile.inc
+@@ -10,4 +10,4 @@
+ FIRMWS= ${_FIRM}:${KMOD}
- iwlwifi-4965-4.44.17.fw: ${.CURDIR}/../../contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu
-- uudecode -p ${.CURDIR}/../../contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu > ${.TARGET}
-+ uudecode -o- ${.CURDIR}/../../contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu > ${.TARGET}
+ ${_FIRM}: ${.CURDIR}/../../../contrib/dev/iwn/${_FIRM}.uu
+- uudecode -p $? > ${.TARGET}
++ uudecode -o- $? > ${.TARGET}
+--- a/sys/modules/runfw/Makefile
++++ b/sys/modules/runfw/Makefile
+@@ -6,6 +6,6 @@
+ CLEANFILES= runfw
+ runfw: ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu
+- uudecode -p ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu > ${.TARGET}
++ uudecode -o- ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu > ${.TARGET}
+
.include <bsd.kmod.mk>
Modified: trunk/kfreebsd-8/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/999_config.diff 2010-06-14 10:58:45 UTC (rev 3044)
@@ -33,8 +33,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -83,7 +83,7 @@
- #options KDTRACE_HOOKS # Kernel DTrace hooks
+@@ -84,7 +84,7 @@
+ options INCLUDE_CONFIG_FILE # Include this file in kernel
# Make an SMP-capable kernel by default
-options SMP # Symmetric MultiProcessor Kernel
@@ -42,7 +42,7 @@
# CPU frequency control
device cpufreq
-@@ -92,9 +92,6 @@
+@@ -93,9 +93,6 @@
device acpi
device pci
@@ -52,7 +52,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -102,6 +99,8 @@
+@@ -103,6 +100,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -61,7 +61,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -184,10 +183,6 @@
+@@ -185,10 +184,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -72,10 +72,10 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -269,11 +264,8 @@
- device loop # Network loopback
+@@ -272,11 +267,8 @@
device random # Entropy device
device ether # Ethernet support
+ device vlan # 802.1Q VLAN support
-device tun # Packet tunnel.
device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
@@ -84,22 +84,18 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -289,14 +281,12 @@
+@@ -293,10 +285,8 @@
#device udbp # USB Double Bulk Pipe devices
device uhid # "Human Interface Devices"
device ukbd # Keyboard
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
- device rum # Ralink Technology RT2501USB wireless NICs
- device uath # Atheros AR5523 wireless NICs
- device ural # Ralink Technology RT2500USB wireless NICs
- device zyd # ZyDAS zb1211/zb1211b wireless NICs
-device urio # Diamond Rio 500 MP3 player
# USB Serial devices
device uark # Technologies ARK3116 based serial adapters
device ubsa # Belkin F5U103 and compatible serial adapters
-@@ -322,3 +312,11 @@
+@@ -327,3 +317,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -159,8 +155,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -83,7 +85,7 @@
- #options KDTRACE_HOOKS # Kernel DTrace hooks
+@@ -84,7 +86,7 @@
+ options INCLUDE_CONFIG_FILE # Include this file in kernel
# To make an SMP kernel, the next two lines are needed
-options SMP # Symmetric MultiProcessor Kernel
@@ -168,7 +164,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -94,9 +96,6 @@
+@@ -95,9 +97,6 @@
device eisa
device pci
@@ -178,7 +174,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -104,6 +103,8 @@
+@@ -105,6 +104,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -187,7 +183,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -195,10 +196,6 @@
+@@ -196,10 +197,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -198,10 +194,10 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -282,11 +279,8 @@
- device loop # Network loopback
+@@ -285,11 +282,8 @@
device random # Entropy device
device ether # Ethernet support
+ device vlan # 802.1Q VLAN support
-device tun # Packet tunnel.
device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
@@ -210,22 +206,18 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -302,14 +296,12 @@
+@@ -306,10 +300,8 @@
#device udbp # USB Double Bulk Pipe devices
device uhid # "Human Interface Devices"
device ukbd # Keyboard
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
- device rum # Ralink Technology RT2501USB wireless NICs
- device ural # Ralink Technology RT2500USB wireless NICs
- device uath # Atheros AR5523 wireless NICs
- device zyd # ZyDAS zb1211/zb1211b wireless NICs
-device urio # Diamond Rio 500 MP3 player
# USB Serial devices
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
-@@ -336,3 +328,11 @@
+@@ -341,3 +333,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/patches/series 2010-06-14 10:58:45 UTC (rev 3044)
@@ -1,12 +1,3 @@
-000_mcinit.diff
-000_multicast.diff
-000_nfsclient.diff
-000_nfsreconnect.diff
-000_rename.diff
-000_sctp.diff
-000_zfs.diff
-000_zfsmac.diff
-000_zfsvaccess.diff
001_misc.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
@@ -19,7 +10,6 @@
102_POLL_HUP.diff
103_stat_pipe.diff
104_linprocfs.diff
-105_pts.diff
902_version.diff
903_disable_non-free_drivers.diff
904_dev_full.diff
Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules 2010-06-09 12:32:45 UTC (rev 3043)
+++ trunk/kfreebsd-8/debian/rules 2010-06-14 10:58:45 UTC (rev 3044)
@@ -8,6 +8,7 @@
#export DH_VERBOSE=1
full_version := $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
+tar_version := $(shell echo $(full_version) | sed -e 's/[+-].*//g')
version := $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
major := $(shell echo $(version) | sed -e 's/\..*//g')
revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
@@ -16,9 +17,10 @@
config_files := $(wildcard debian/arch/$(cpu)/*.config)
flavours := $(config_files:debian/arch/$(cpu)/%.config=%)
configfile := DEBCUSTOM
-abiname := 1
+abiname := 0
SVN := http://svn.freebsd.org/base/release/$(version).0
+SVN := http://svn.freebsd.org/base/releng/8.1
SOURCE_PACKAGE := $(CURDIR)/debian/kfreebsd-source-$(version)
IMAGE_PACKAGE := $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
HEADERS_PACKAGE := $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)
@@ -26,8 +28,8 @@
SRC_DIR := kfreebsd-source-$(version)
HEADERS_DIR := kfreebsd-headers-$(version)-$(abiname)
FLAVOR_DIR := flavor-$(version)-$(abiname)
-ORIG_DIR := kfreebsd-$(major)-$(version)
-ORIG_TAR := kfreebsd-$(major)_$(version).orig.tar.gz
+ORIG_DIR := kfreebsd-$(major)-$(tar_version)
+ORIG_TAR := kfreebsd-$(major)_$(tar_version).orig.tar.gz
MAKE := make MACHINE_ARCH=$(cpu) CC=gcc-4.3 WERROR=
PATH := $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
More information about the Glibc-bsd-commits
mailing list